[ARVADOS] updated: 840b855ff0317e66f4176ae0f23e9785f72267b4

[Git user]

Summary of changes:
 apps/workbench/app/models/arvados_resource_list.rb     | 2 ++
 apps/workbench/test/unit/arvados_resource_list_test.rb | 8 ++++++++
 apps/workbench/test/unit/link_test.rb                  | 3 +++
 apps/workbench/test/unit/pipeline_instance_test.rb     | 3 +++
 apps/workbench/test/unit/work_unit_test.rb             | 3 +++
 5 files changed, 19 insertions(+)

       via  840b855ff0317e66f4176ae0f23e9785f72267b4 (commit)
       via  1220e2184449ccab288fa41de4749fb029cd317b (commit)
       via  17b80c32a5b177ee8c5f32b81dd0889f3399eee8 (commit)
      from  35c2572761bb060aa1c12f417f97aa9e1ccbe7eb (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 840b855ff0317e66f4176ae0f23e9785f72267b4
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Apr 24 14:02:54 2017 -0400

    11517: Add test for count=none.

diff --git a/apps/workbench/test/unit/arvados_resource_list_test.rb b/apps/workbench/test/unit/arvados_resource_list_test.rb
index b0f274d..cfdf8f9 100644
--- a/apps/workbench/test/unit/arvados_resource_list_test.rb
+++ b/apps/workbench/test/unit/arvados_resource_list_test.rb
@@ -93,4 +93,10 @@ class ResourceListTest < ActiveSupport::TestCase
     assert_empty c.results
   end
 
+  test 'count=none' do
+    use_token :active
+    c = Collection.with_count('none')
+    assert_nil c.items_available
+    refute_empty c.results
+  end
 end

commit 1220e2184449ccab288fa41de4749fb029cd317b
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Apr 24 14:00:45 2017 -0400

    11517: Skip database reset in some workbench unit tests.
    
    Reduces unit test suite time by half.

diff --git a/apps/workbench/test/unit/arvados_resource_list_test.rb b/apps/workbench/test/unit/arvados_resource_list_test.rb
index a3bfbc1..b0f274d 100644
--- a/apps/workbench/test/unit/arvados_resource_list_test.rb
+++ b/apps/workbench/test/unit/arvados_resource_list_test.rb
@@ -2,6 +2,8 @@ require 'test_helper'
 
 class ResourceListTest < ActiveSupport::TestCase
 
+  reset_api_fixtures :after_each_test, false
+
   test 'links_for on a resource list that does not return links' do
     use_token :active
     results = Specimen.all
diff --git a/apps/workbench/test/unit/link_test.rb b/apps/workbench/test/unit/link_test.rb
index 7636335..9687292 100644
--- a/apps/workbench/test/unit/link_test.rb
+++ b/apps/workbench/test/unit/link_test.rb
@@ -1,6 +1,9 @@
 require 'test_helper'
 
 class LinkTest < ActiveSupport::TestCase
+
+  reset_api_fixtures :after_each_test, false
+
   def uuid_for(fixture_name, object_name)
     api_fixture(fixture_name)[object_name]["uuid"]
   end
diff --git a/apps/workbench/test/unit/pipeline_instance_test.rb b/apps/workbench/test/unit/pipeline_instance_test.rb
index 747cfc1..926bb68 100644
--- a/apps/workbench/test/unit/pipeline_instance_test.rb
+++ b/apps/workbench/test/unit/pipeline_instance_test.rb
@@ -1,6 +1,9 @@
 require 'test_helper'
 
 class PipelineInstanceTest < ActiveSupport::TestCase
+
+  reset_api_fixtures :after_each_test, false
+
   def find_pi_with(token_name, pi_name)
     use_token token_name
     find_fixture(PipelineInstance, pi_name)
diff --git a/apps/workbench/test/unit/work_unit_test.rb b/apps/workbench/test/unit/work_unit_test.rb
index 564a5d3..8bbbb5c 100644
--- a/apps/workbench/test/unit/work_unit_test.rb
+++ b/apps/workbench/test/unit/work_unit_test.rb
@@ -1,6 +1,9 @@
 require 'test_helper'
 
 class WorkUnitTest < ActiveSupport::TestCase
+
+  reset_api_fixtures :after_each_test, false
+
   setup do
     Rails.configuration.anonymous_user_token = api_fixture('api_client_authorizations')['anonymous']['api_token']
   end

commit 17b80c32a5b177ee8c5f32b81dd0889f3399eee8
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Apr 24 13:42:31 2017 -0400

    11517: Comment with_count() method

diff --git a/apps/workbench/app/models/arvados_resource_list.rb b/apps/workbench/app/models/arvados_resource_list.rb
index e56d198..35dcde3 100644
--- a/apps/workbench/app/models/arvados_resource_list.rb
+++ b/apps/workbench/app/models/arvados_resource_list.rb
@@ -84,6 +84,8 @@ class ArvadosResourceList
     self
   end
 
+  # with_count sets the 'count' parameter to 'exact' or 'none' -- see
+  # https://doc.arvados.org/api/methods.html#index
   def with_count(count_param='exact')
     @count = count_param
     self

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


hooks/post-receive
--