Merge branch 'master' into 3112-report-bug

[arvados.git] / 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 631de5e11828f574f4db09af3b584fbc33cc95f1..b8000812d19383b94cf2d95859e19012b069ef68 100644 (file)
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -105,19 +105,28 @@ class ErrorsTest < ActionDispatch::IntegrationTest
       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?('API version'), 'API version  text not found'
+        assert page.has_text?('API startup time'), 'API startup time 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?('Send problem report'), 'Send problem report button not found'
         assert page.has_button?('Cancel'), 'Cancel button not found'
 
         # enter a report text and click on report
         page.find_field('report_issue_text').set 'my test report text'
-        click_button 'Report issue'
+        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_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'
+
+        click_button 'Close'
       end
 
       # 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')
+      assert(page.has_text?('Dashboard'), 'Expected to see dashboard')
     ensure
       Rails.configuration.arvados_v1_base = original_arvados_v1_base
     end