[ARVADOS] updated: 61d432f332dd9314f8c4cd57c2393e80e8ecef59

[git at public.curoverse.com]

Summary of changes:
 .../test/integration/application_layout_test.rb    | 31 ++++++++++++++++
 .../workbench/test/integration/system_menu_test.rb | 42 ----------------------
 2 files changed, 31 insertions(+), 42 deletions(-)
 delete mode 100644 apps/workbench/test/integration/system_menu_test.rb

       via  61d432f332dd9314f8c4cd57c2393e80e8ecef59 (commit)
      from  4999699d7614f214eb8718b85c5c30e9fb382c23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 61d432f332dd9314f8c4cd57c2393e80e8ecef59
Author: Manoj <jonam33 at gmail.com>
Date:   Mon Jul 20 14:09:40 2015 -0400

    6652: Moved system menu test into application_layout_test.

diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index daf2b09..f05021c 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -201,4 +201,35 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
       assert page.has_link?('Report a problem ...'), 'No link - Report a problem'
     end
   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
diff --git a/apps/workbench/test/integration/system_menu_test.rb b/apps/workbench/test/integration/system_menu_test.rb
deleted file mode 100644
index 7e67b1b..0000000
--- a/apps/workbench/test/integration/system_menu_test.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'integration_helper'
-
-class SystemMenuTest < ActionDispatch::IntegrationTest
-  # These tests don't do state-changing API calls. Save some time by
-  # skipping the database reset.
-  reset_api_fixtures :after_each_test, false
-  reset_api_fixtures :after_suite, true
-
-  setup do
-    need_javascript
-  end
-
-  [
-    #['Repositories','repository','Attributes'], Fails due to #6652
-    ['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
-      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

-----------------------------------------------------------------------


hooks/post-receive
--