[ARVADOS] updated: 9386030bbd51fdfc00b6415aa3ae14dd7d3a1591

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/performance/browsing_test.rb | 22 ++++++++++----
 apps/workbench/test/performance/search_test.rb   | 37 ------------------------
 2 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 apps/workbench/test/performance/search_test.rb

       via  9386030bbd51fdfc00b6415aa3ae14dd7d3a1591 (commit)
      from  f34090c0b416f573b5cd35aae557fa443e8b2f03 (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 9386030bbd51fdfc00b6415aa3ae14dd7d3a1591
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Tue Dec 9 20:31:02 2014 -0500

    4754: move search test into browsing_test.rb instead of having its own file.

diff --git a/apps/workbench/test/performance/browsing_test.rb b/apps/workbench/test/performance/browsing_test.rb
index 27b55c4..1340bcc 100644
--- a/apps/workbench/test/performance/browsing_test.rb
+++ b/apps/workbench/test/performance/browsing_test.rb
@@ -7,10 +7,6 @@ require 'selenium-webdriver'
 require 'headless'
 
 class BrowsingTest < ActionDispatch::PerformanceTest
-  # Refer to the documentation for all available options
-  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
-  #                          :output => 'tmp/performance', :formats => [:flat] }
-
   self.profile_options = { :runs => 10,
                            :metrics => [:wall_time],
                            :output => 'tmp/performance',
@@ -23,9 +19,25 @@ class BrowsingTest < ActionDispatch::PerformanceTest
     Capybara.current_session.driver.browser.manage.window.resize_to(1024, 768)
   end
 
-  def test_homepage
+  test "visit home page" do
     visit page_with_token('active')
     assert_text 'Dashboard'
     assert_selector 'a', text: 'Run a pipeline'
   end
+
+  test "search for hash" do
+    visit page_with_token('active')
+
+    within('.navbar-fixed-top') do
+      page.find_field('search').set('hash')
+      page.find('.glyphicon-search').click
+    end
+
+    # In the search dialog now. Expect at least one item in the result display.
+    within '.modal-content' do
+      assert_text 'All projects'
+      assert_text 'Search'
+      assert_selector('div', text: 'zzzzz-')
+    end
+  end
 end
diff --git a/apps/workbench/test/performance/search_test.rb b/apps/workbench/test/performance/search_test.rb
deleted file mode 100644
index ab71d84..0000000
--- a/apps/workbench/test/performance/search_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# http://guides.rubyonrails.org/v3.2.13/performance_testing.html
-
-require 'test_helper'
-require 'rails/performance_test_help'
-require 'integration_helper'
-require 'selenium-webdriver'
-require 'headless'
-
-class SearchTest < ActionDispatch::PerformanceTest
-  self.profile_options = { :runs => 10,
-                           :metrics => [:wall_time],
-                           :output => 'tmp/performance',
-                           :formats => [:flat] }
-
-  setup do
-    headless = Headless.new
-    headless.start
-    Capybara.current_driver = :selenium
-    Capybara.current_session.driver.browser.manage.window.resize_to(1024, 768)
-  end
-
-  def test_search
-    visit page_with_token('active')
-
-    within('.navbar-fixed-top') do
-      page.find_field('search').set('hash')
-      page.find('.glyphicon-search').click
-    end
-
-    # We should now be in the search dialog. Expect at least one item in the result display.
-    within '.modal-content' do
-      assert_text 'All projects'
-      assert_text 'Search'
-      assert_selector('div', text: 'zzzzz-')
-    end
-  end
-end

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


hooks/post-receive
--