X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ecc16570f7b336c7cd3a4b77876db8e6d4ed4fad..040fdf6da00318b5b8e8e83eceeec783680ecb1c:/apps/workbench/test/integration/errors_test.rb

diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index b5156b41bc..d2b8fd6fab 100644
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -1,12 +1,8 @@
 require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
 
 class ErrorsTest < ActionDispatch::IntegrationTest
   setup do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
+    need_javascript
   end
 
   BAD_UUID = "ffffffffffffffffffffffffffffffff+0"
@@ -83,53 +79,45 @@ class ErrorsTest < ActionDispatch::IntegrationTest
   end
 
   test "API error page has Report problem button" do
-    visit page_with_token("active")
-
+    # point to a bad api server url to generate fiddlesticks error
     original_arvados_v1_base = Rails.configuration.arvados_v1_base
+    Rails.configuration.arvados_v1_base = "https://[::1]:1/"
 
-    begin
-      # point to a bad api server url to generate fiddlesticks error
-      Rails.configuration.arvados_v1_base = "https://[100::f]:1/"
-
-      visit page_with_token("active")
-
-      assert(page.has_text?(/fiddlesticks/i), 'Expected to be in error page')
+    visit page_with_token("active")
 
-      # reset api server base config to let the popup rendering to work
-      Rails.configuration.arvados_v1_base = original_arvados_v1_base
+    assert_text 'fiddlesticks'
 
-      # check the "Report problem" button
-      assert page.has_link? 'Report problem', 'Report problem link not found'
+    # reset api server base config to let the popup rendering to work
+    Rails.configuration.arvados_v1_base = original_arvados_v1_base
 
-      click_link 'Report problem'
-      within '.modal-content' do
-        assert page.has_text?('Report a problem'), 'Report a problem text not found'
-        assert page.has_no_text?('Version / debugging info'), 'Version / debugging info is not expected'
-        assert page.has_text?('Server version'), 'Server version  text not found'
-        assert page.has_text?('Server restarted at'), 'Server restarted at text not found'
-        assert page.has_text?('Found a problem?'), 'Found a problem text not found'
-        assert page.has_button?('Report issue'), 'Report issue button not found'
-        assert page.has_button?('Cancel'), 'Cancel button not found'
+    click_link 'Report problem'
 
-        # enter a report text and click on report
-        page.find_field('report_issue_text').set 'my test report text'
-        click_button 'Report issue'
+    within '.modal-content' do
+      assert_text 'Report a problem'
+      assert_no_text 'Version / debugging info'
+      assert_text 'Describe the problem'
+      assert_text 'Send problem report'
+      # "Send" button should be disabled until text is entered
+      assert_no_selector 'a,button:not([disabled])', text: 'Send problem report'
+      assert_selector 'a,button', text: 'Cancel'
 
-        # ajax success updated button texts and added footer message
-        assert page.has_no_button?('Report issue'), 'Found button - Report issue'
-        assert page.has_no_button?('Cancel'), 'Found button - Cancel'
-        assert page.has_text?('Report sent'), 'No text - Report sent'
-        assert page.has_button?('Close'), 'No button - Close'
-        assert page.has_text?('Thanks for reporting this issue'), 'No text - Thanks for reporting this issue'
+      report = mock
+      report.expects(:deliver).returns true
+      IssueReporter.expects(:send_report).returns report
 
-        click_button 'Close'
-      end
+      # enter a report text and click on report
+      find_field('report_issue_text').set 'my test report text'
+      click_button 'Send problem report'
 
-      # out of the popup now and should be back in the error page
-      assert(page.has_text?(/fiddlesticks/i), 'Expected to be in error page')
-    ensure
-      Rails.configuration.arvados_v1_base = original_arvados_v1_base
+      # ajax success updated button texts and added footer message
+      assert_no_selector 'a,button', text: 'Send problem report'
+      assert_no_selector 'a,button', text: 'Cancel'
+      assert_text 'Report sent'
+      assert_text 'Thanks for reporting this issue'
+      click_button 'Close'
     end
-  end
 
+    # out of the popup now and should be back in the error page
+    assert_text 'fiddlesticks'
+  end
 end