[ARVADOS] updated: 7c76d9218ef91b14ede8a06fe9a96a5016361e17

[git at public.curoverse.com]

Summary of changes:
 .../app/views/pipeline_instances/index.html.erb        |  3 ++-
 .../test/integration/pipeline_instances_test.rb        | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

       via  7c76d9218ef91b14ede8a06fe9a96a5016361e17 (commit)
      from  f628e38317c20513cb73f81633d6a7c0663b8fd5 (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 7c76d9218ef91b14ede8a06fe9a96a5016361e17
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 7 11:47:54 2014 -0500

    4024: add tests for search filter in pipelin_instances page.

diff --git a/apps/workbench/app/views/pipeline_instances/index.html.erb b/apps/workbench/app/views/pipeline_instances/index.html.erb
index ee6f0bd..0ad2ca0 100644
--- a/apps/workbench/app/views/pipeline_instances/index.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/index.html.erb
@@ -6,7 +6,8 @@
 
   <%= form_tag pipeline_instances_path, method: 'get', remote: true, class: 'form-search' do %>
     <div class="input-group">
-      <input type="text" class="form-control filterable-control" placeholder="Search pipeline instances" 
+      <input type="text" class="form-control filterable-control recent-pipeline-instances-filterable-control"
+             placeholder="Search pipeline instances" 
              data-filterable-target="table.arv-recent-pipeline-instances tbody"/>
        <span class="input-group-btn">
          <%= button_tag(class: 'btn btn-info') do %>
diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index 3a80220..fc24322 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -366,12 +366,22 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
   end
 
   [
-    ['fuse', 2, 20],              # has  2 pipeline instances on 11-07-2014
-    ['user1_with_load', 30, 100], # has 37 pipeline instances on 11-07-2014
-  ].each do |user, expected_min, expected_max|
-    test "scroll pipeline instances page for #{user} and expect more than #{expected_min} and less than #{expected_max}" do
+    ['fuse', nil, 2, 20],                           # has  2 as of 11-07-2014
+    ['fuse', 'no such match', 0, 0],
+    ['fuse', 'FUSE project', 1, 1],                 # 1 with this name
+    ['user1_with_load', nil, 30, 100],              # has 37 as of 11-07-2014
+    ['user1_with_load', 'no such match', 0, 0],
+    ['user1_with_load', '000010pipelines', 10, 10], # owned_by the project zzzzz-j7d0g-000010pipelines
+    ['user1_with_load', 'pipeline_10', 2, 2],       # 2 with this name
+  ].each do |user, search_filter, expected_min, expected_max|
+    test "scroll pipeline instances page for #{user} with search filter #{search_filter} and expect more than #{expected_min} and less than #{expected_max}" do
       visit page_with_token(user, "/pipeline_instances")
 
+      if search_filter
+        find('.recent-pipeline-instances-filterable-control').set(search_filter)
+        wait_for_ajax
+      end
+
       num_pages = expected_max/20 + 1 # pipeline_instances page uses 20 for page size
       within('.arv-recent-pipeline-instances') do
         (0..num_pages).each do |i|

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


hooks/post-receive
--