3112: change submit button text

diff --git a/apps/workbench/app/assets/javascripts/report_issue.js b/apps/workbench/app/assets/javascripts/report_issue.js
index 362a9a1b033e11cca148568b96962aab54dec1ba..482fd535484d32356781744271402e07bbe0edce 100644 (file)
--- a/apps/workbench/app/assets/javascripts/report_issue.js
+++ b/apps/workbench/app/assets/javascripts/report_issue.js
@@ -25,7 +25,7 @@ $(document).
     if ($sendButton && $sendButton.prop('disabled')) {
       $('div').remove('.modal-footer-status');
       $('.modal-footer').append('<div class="modal-footer-status alert alert-danger"></br><p align="left">We are sorry. We could not submit your report! We really want this to work, though -- please try again.</p></div>');
-      $sendButton.html('Report a problem');
+      $sendButton.html('Send problem report');
       $sendButton.attr('disabled',false);
     }
     var $cancelButton = $('#report-issue-cancel');

diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index cd4c57bfbdfa25344b2f58e07bfae527452df40f..3efa6c4c2d82cc2a712d9649a537fdb03b33e833 100644 (file)
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -142,7 +142,7 @@
 
       <div class="modal-footer">
         <% if @popup_params[:popup_type] == 'report' %>
-          <button type="submit" id="report-issue-submit" class="btn btn-primary report-issue-submit" autofocus>Report a problem</button>
+          <button type="submit" id="report-issue-submit" class="btn btn-primary report-issue-submit" autofocus>Send problem report</button>
           <button class="btn btn-default report-issue-cancel" id="report-issue-cancel" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Cancel</button>
         <% else %>
           <button class="btn btn-default" onClick="reset_form()" data-dismiss="modal" aria-hidden="true">Close</button>

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index fa6793d25280bc26ce0c44624c882374ef7e6c70..5ce850dd1af15b00c10517d4a34bfaea383cbde5 100644 (file)
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -71,8 +71,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         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'
-        assert page.has_link?('Show version / debugging info'), 'No link - Show version / debugging info'
-        assert page.has_link?('Report a problem'), 'No link - Report a problem'
+        assert page.has_link?('Show version / debugging info ...'), 'No link - Show version / debugging info'
+        assert page.has_link?('Report a problem ...'), 'No link - Report a problem'
         # Version info and Report a problem are tested in "report_issue_test.rb"
       end
     end

diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index 4b801da7898380fe9726e3295682e5d1cbb6c5cf..fe87c58fb06b7f61bddba48a8092adc1ccbfeb58 100644 (file)
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -23,8 +23,8 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
         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'
-        assert page.has_link?('Show version / debugging info'), 'No link - Show version / debugging info'
-        assert page.has_link?('Report a problem'), 'No link - Report a problem'
+        assert page.has_link?('Show version / debugging info ...'), 'No link - Show version / debugging info'
+        assert page.has_link?('Report a problem ...'), 'No link - Report a problem'
 
         # check show version info link
         click_link 'Show version / debugging info ...'
@@ -40,7 +40,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       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_button?('Close'), 'No button - Close'
-      assert page.has_no_button?('Report a problem'), 'Found button - Report a problem'
+      assert page.has_no_button?('Send problem report'), 'Found button - Send problem report'
       click_button 'Close'
     end
 
@@ -61,15 +61,15 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       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_no_button?('Close'), 'Found button - Close'
-      assert page.has_button?('Report a problem'), 'No button - Report a problem'
+      assert page.has_button?('Send problem report'), 'No button - Send problem report'
       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'
-      click_button 'Report a problem'
+      click_button 'Send problem report'
 
       # ajax success updated button texts and added footer message
-      assert page.has_no_button?('Report a problem'), 'Found button - Report a problem'
+      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 text - Close'