Merge branch 'master' into 6652-test-system-menu

Conflicts:
	apps/workbench/test/integration/application_layout_test.rb

diff --cc apps/workbench/test/integration/application_layout_test.rb
index f05021cd495c8d625e083c2dd553f3b979232cb6,1f9edd422babfbf2906821fd4e0f1fa4cf805552..31a297f0c14c3dd4215499e8d202d294ca980ff5
--- 1/apps/workbench/test/integration/application_layout_test.rb
--- 2/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@@ -202,34 -202,11 +202,42 @@@ class ApplicationLayoutTest < ActionDis
      end
    end
  
+   test "no SSH public key notification when shell_in_a_box_url is configured" do
+     Rails.configuration.shell_in_a_box_url = 'example.com'
+     visit page_with_token('job_reader')
+     click_link 'notifications-menu'
+     assert_no_selector 'a', text:'Click here to set up an SSH public key for use with Arvados.'
+     assert_selector 'a', text:'Click here to learn how to run an Arvados Crunch pipeline'
+   end
++
 +   [
 +    ['Repositories','repository','Attributes'],
 +    ['Virtual machines','virtual machine','current_user_logins'],
 +    ['SSH keys','authorized key','public_key'],
 +    ['Links','link','link_class'],
 +    ['Groups','group','group_class'],
 +    ['Compute nodes','node','info[ping_secret'],
 +    ['Keep services','keep service','service_ssl_flag'],
 +    ['Keep disks', 'keep disk','bytes_free'],
 +  ].each do |page_name, add_button_text, look_for|
 +    test "test system menu #{page_name} link" do
 +      skip 'Skip repositories test until #6652 is fixed.' if page_name == 'Repositories'
 +
 +      visit page_with_token('admin')
 +      within('.navbar-fixed-top') do
 +        page.find("#system-menu").click
 +        within('.dropdown-menu') do
 +          assert_selector 'a', text: page_name
 +          find('a', text: page_name).click
 +        end
 +      end
 +
 +      # click the add button
 +      assert_selector 'button', text: "Add a new #{add_button_text}"
 +      find('button', text: "Add a new #{add_button_text}").click
 +
 +      # look for unique property in the created object page
 +      assert page.has_text? look_for
 +    end
 +  end
  end