[ARVADOS] updated: 59129909453452693bd6e7be144cb9417479e98f

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml            |  2 +-
 .../integration_performance/collections_perf_test.rb     | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

       via  59129909453452693bd6e7be144cb9417479e98f (commit)
      from  bf0c6769acfd8728c1e7563f26eb6f5e1f589874 (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 59129909453452693bd6e7be144cb9417479e98f
Author: radhika <radhika at curoverse.com>
Date:   Thu May 21 12:09:07 2015 -0400

    refs #6061
    6061: set profiling_enabled to true in workbench application.default.yml for test env.

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 4061ee8..07d79a0 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -88,7 +88,7 @@ test:
   action_controller.allow_forgery_protection: false
   action_mailer.delivery_method: :test
   active_support.deprecation: :stderr
-  profiling_enabled: false
+  profiling_enabled: true
   secret_token: <%= rand(2**256).to_s(36) %>
   secret_key_base: <%= rand(2**256).to_s(36) %>
 
diff --git a/apps/workbench/test/integration_performance/collections_perf_test.rb b/apps/workbench/test/integration_performance/collections_perf_test.rb
index 575a0a9..3adece1 100644
--- a/apps/workbench/test/integration_performance/collections_perf_test.rb
+++ b/apps/workbench/test/integration_performance/collections_perf_test.rb
@@ -22,7 +22,11 @@ class CollectionsPerfTest < ActionDispatch::IntegrationTest
     end
     manifest_text << "\n"
 
-    Collection.create! ({manifest_text: manifest_text})
+    Rails.logger.info "Creating collection at #{Time.now.to_f}"
+    collection = Collection.create! ({manifest_text: manifest_text})
+    Rails.logger.info "Done creating collection at #{Time.now.to_f}"
+
+    collection
   end
 
   [
@@ -34,7 +38,9 @@ class CollectionsPerfTest < ActionDispatch::IntegrationTest
       use_token :active
       new_collection = create_large_collection size, 'collection_file_name_with_prefix_'
 
+      Rails.logger.info "Visiting collection at #{Time.now.to_f}"
       visit page_with_token('active', "/collections/#{new_collection.uuid}")
+      Rails.logger.info "Done visiting collection at #{Time.now.to_f}"
 
       assert_text new_collection.uuid
       assert(page.has_link?('collection_file_name_with_prefix_0'), "Collection page did not include file link")
@@ -52,17 +58,21 @@ class CollectionsPerfTest < ActionDispatch::IntegrationTest
       use_token :active
       new_collection = create_large_collection size, 'collection_file_name_with_prefix_'
 
+      Rails.logger.info "Visiting collection at #{Time.now.to_f}"
       visit page_with_token('active', "/collections/#{new_collection.uuid}")
+      Rails.logger.info "Done visiting collection at #{Time.now.to_f}"
 
       assert_text new_collection.uuid
       assert(page.has_link?('collection_file_name_with_prefix_0'), "Collection page did not include file link")
 
       # edit description
+      Rails.logger.info "Editing description at #{Time.now.to_f}"
       within('.arv-description-as-subtitle') do
         find('.fa-pencil').click
         find('.editable-input textarea').set('description for this large collection')
         find('.editable-submit').click
       end
+      Rails.logger.info "Done editing description at #{Time.now.to_f}"
 
       assert_text 'description for this large collection'
     end
@@ -78,7 +88,9 @@ class CollectionsPerfTest < ActionDispatch::IntegrationTest
       first_collection = create_large_collection size1, 'collection_file_name_with_prefix_1_'
       second_collection = create_large_collection size2, 'collection_file_name_with_prefix_2_'
 
+      Rails.logger.info "Visiting collections page at #{Time.now.to_f}"
       visit page_with_token('active', "/collections")
+      Rails.logger.info "Done visiting collections page at at #{Time.now.to_f}"
 
       assert_text first_collection.uuid
       assert_text second_collection.uuid
@@ -91,10 +103,12 @@ class CollectionsPerfTest < ActionDispatch::IntegrationTest
         find('input[type=checkbox]').click
       end
 
+      Rails.logger.info "Clicking on combine collections option at #{Time.now.to_f}"
       click_button 'Selection...'
       within('.selection-action-container') do
         click_link 'Create new collection with selected collections'
       end
+      Rails.logger.info "Done combining collections at #{Time.now.to_f}"
 
       assert(page.has_link?('collection_file_name_with_prefix_1_0'), "Collection page did not include file link")
     end

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


hooks/post-receive
--