3112: update issue report routes config and some other minor test updates.

diff --git a/apps/workbench/config/routes.rb b/apps/workbench/config/routes.rb
index 26c38ffe136d016fde64a6c15274860e142a3e6c..e58796e40ccf1ee7988cb06bb7caea8b2b1e6e33 100644 (file)
--- a/apps/workbench/config/routes.rb
+++ b/apps/workbench/config/routes.rb
@@ -10,8 +10,8 @@ ArvadosWorkbench::Application.routes.draw do
   get '/user_agreements/signatures' => 'user_agreements#signatures'
   get "users/setup_popup" => 'users#setup_popup', :as => :setup_user_popup
   get "users/setup" => 'users#setup', :as => :setup_user
-  get "actions/report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
-  post "actions/report_issue" => 'actions#report_issue', :as => :report_issue
+  get "report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
+  post "report_issue" => 'actions#report_issue', :as => :report_issue
   resources :nodes
   resources :humans
   resources :traits

diff --git a/apps/workbench/test/integration/errors_test.rb b/apps/workbench/test/integration/errors_test.rb
index b8000812d19383b94cf2d95859e19012b069ef68..de595e30ab310069a32d1a872ba41891d36e718c 100644 (file)
--- a/apps/workbench/test/integration/errors_test.rb
+++ b/apps/workbench/test/integration/errors_test.rb
@@ -83,8 +83,6 @@ class ErrorsTest < ActionDispatch::IntegrationTest
   end
 
   test "API error page has Report problem button" do
-    visit page_with_token("active")
-
     original_arvados_v1_base = Rails.configuration.arvados_v1_base
 
     begin
@@ -105,9 +103,7 @@ 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?('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_text?('Describe the problem'), 'Describe the problem text not found'
         assert page.has_button?('Send problem report'), 'Send problem report button not found'
         assert page.has_button?('Cancel'), 'Cancel button not found'
 

diff --git a/apps/workbench/test/integration/report_issue_test.rb b/apps/workbench/test/integration/report_issue_test.rb
index c165a56644814702cac44a1084106ab948295484..cf41e23c7eb53105d4a48da868fecc524931e253 100644 (file)
--- a/apps/workbench/test/integration/report_issue_test.rb
+++ b/apps/workbench/test/integration/report_issue_test.rb
@@ -2,7 +2,7 @@ require 'integration_helper'
 require 'selenium-webdriver'
 require 'headless'
 
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class ReportIssueTest < ActionDispatch::IntegrationTest
   setup do
     headless = Headless.new
     headless.start
@@ -34,11 +34,7 @@ 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'
       click_button 'Close'
@@ -55,11 +51,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
     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_button?('Cancel'), 'No button - Cancel'

diff --git a/apps/workbench/test/integration/search_box_test.rb b/apps/workbench/test/integration/search_box_test.rb
index dcdce155fc2c48709cff260b080e4ad3927a9b8c..0cdfdc8aab3df48a5f61633f5e38ce9dbe801bf8 100644 (file)
--- a/apps/workbench/test/integration/search_box_test.rb
+++ b/apps/workbench/test/integration/search_box_test.rb
@@ -2,7 +2,7 @@ require 'integration_helper'
 require 'selenium-webdriver'
 require 'headless'
 
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class SearchBoxTest < ActionDispatch::IntegrationTest
   setup do
     headless = Headless.new
     headless.start
@@ -36,9 +36,7 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       within '.modal-content' do
         assert page.has_text?('Report a problem'), 'No text - Report a problem'
         assert page.has_no_text?('Version / debugging info'), 'No 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?('Found a problem?'), 'No text - Found a problem'
+        assert page.has_text?('Describe the problem'), 'No text - Describe the problem'
         assert page.has_button?('Send problem report'), 'No button - Send problem report'
         assert page.has_button?('Cancel'), 'No button - Cancel'
 

diff --git a/apps/workbench/test/integration/user_profile_test.rb b/apps/workbench/test/integration/user_profile_test.rb
index edee0640174a23c2ec92de919348afdbea2745d0..ede67ff36aff82dd661a2cb0f2ebc1df6996e724 100644 (file)
--- a/apps/workbench/test/integration/user_profile_test.rb
+++ b/apps/workbench/test/integration/user_profile_test.rb
@@ -2,7 +2,7 @@ require 'integration_helper'
 require 'selenium-webdriver'
 require 'headless'
 
-class ApplicationLayoutTest < ActionDispatch::IntegrationTest
+class UserProfileTest < ActionDispatch::IntegrationTest
   setup do
     headless = Headless.new
     headless.start