X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8cc7bf367214a6f423199b62ab153b431f21f2a7..3280e2dc5fd16dca63c389b931658d4420faabaf:/apps/workbench/test/integration/report_issue_test.rb

diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index c165a56644..4a15851636 100644
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -1,13 +1,8 @@
 require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
 
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class ReportIssueTest < ActionDispatch::IntegrationTest
   setup do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
-
+    need_javascript
     @user_profile_form_fields = Rails.configuration.user_profile_form_fields
   end
 
@@ -17,9 +12,9 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
 
   # test version info and report issue from help menu
   def check_version_info_and_report_issue_from_help_menu
-    within('.navbar-fixed-top') do
-      page.find("#arv-help").click
-      within('.dropdown-menu') do
+    within '.navbar-fixed-top' do
+      find('.help-menu > a').click
+      within '.help-menu .dropdown-menu' do
         assert page.has_link?('Tutorials and User guide'), 'No link - Tutorials and User guide'
         assert page.has_link?('API Reference'), 'No link - API Reference'
         assert page.has_link?('SDK Reference'), 'No link - SDK Reference'
@@ -34,42 +29,45 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     within '.modal-content' do
       assert page.has_text?('Version / debugging info'), 'No text - Version / debugging info'
       assert page.has_no_text?('Report a problem'), 'Found text - Report a problem'
-      assert page.has_text?('API version'), 'No text - API version'
-      assert page.has_text?('API startup time'), 'No text - API startup time'
-      assert page.has_text?('Workbench version'), 'No text - Workbench version'
-      assert page.has_text?('Workbench URI'), 'No text - Arvados base'
-      assert page.has_no_text?('Found a problem?'), 'Found text - Found a problem'
+      assert page.has_no_text?('Describe the problem?'), 'Found text - Describe the problem'
       assert page.has_button?('Close'), 'No button - Close'
       assert page.has_no_button?('Send problem report'), 'Found button - Send problem report'
+      history_links = all('a').select do |a|
+        a[:href] =~ %r!^https://arvados.org/projects/arvados/repository/changes\?rev=[0-9a-f]+$!
+      end
+      assert_operator(2, :<=, history_links.count,
+                      "Should have found two links to revision history " +
+                      "in #{history_links.inspect}")
       click_button 'Close'
     end
 
     # check report issue link
-    within('.navbar-fixed-top') do
-      page.find("#arv-help").click
-      within('.dropdown-menu') do
-        click_link 'Report a problem ...'
-      end
+    within '.navbar-fixed-top' do
+      find('.help-menu > a').click
+      find('.help-menu .dropdown-menu a', text: 'Report a problem ...').click
     end
 
     within '.modal-content' do
       assert page.has_text?('Report a problem'), 'No text - Report a problem'
       assert page.has_no_text?('Version / debugging info'), 'Found text - Version / debugging info'
-      assert page.has_text?('API version'), 'No text - API version'
-      assert page.has_text?('API startup time'), 'No text - API startup time'
-      assert page.has_text?('Workbench version'), 'No text - Workbench version'
-      assert page.has_text?('Workbench URI'), 'No text - Arvados base'
-      assert page.has_text?('Found a problem?'), 'No text - Found a problem'
+      assert page.has_text?('Describe the problem'), 'No text - Describe the problem'
       assert page.has_no_button?('Close'), 'Found button - Close'
-      assert page.has_button?('Send problem report'), 'No button - Send problem report'
+      assert page.has_text?('Send problem report'), 'Send problem report button text is not found'
+      assert page.has_no_button?('Send problem report'), 'Send problem report button is not disabled before entering problem description'
       assert page.has_button?('Cancel'), 'No button - Cancel'
 
       # enter a report text and click on report
       page.find_field('report_issue_text').set 'my test report text'
+      assert page.has_button?('Send problem report'), 'Send problem report button not enabled after entering text'
+
+      report = mock
+      report.expects(:deliver).returns true
+      IssueReporter.expects(:send_report).returns report
+
       click_button 'Send problem report'
 
       # ajax success updated button texts and added footer message
-      assert page.has_no_button?('Send problem report'), 'Found button - Send problem report'
+      assert page.has_no_text?('Send problem report'), 'Found button - Send problem report'
       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 text - Close'