[ARVADOS] updated: 90e9b3c5ef43242afc42770d03c61489d69c1de5

[git at public.curoverse.com]

Summary of changes:
 docker/base/Dockerfile             | 2 +-
 docker/jobs/Dockerfile             | 5 +----
 services/api/test/test_helper.rb   | 8 +-------
 services/api/test/unit/log_test.rb | 6 ++++--
 4 files changed, 7 insertions(+), 14 deletions(-)

       via  90e9b3c5ef43242afc42770d03c61489d69c1de5 (commit)
       via  7e9bb68c02ff8b21747ad88c89d79395b4c091c0 (commit)
       via  c50fe608334f9fc2e19969f41c04d671cb9c0a19 (commit)
       via  11b71c18e7506374953119d717f7c4e8c52f8bc4 (commit)
       via  4bb3091019c84f748a60492fb52dcc0bba0bbef0 (commit)
      from  9ead624f8ea10f60a6472edb2d15ac576af85515 (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 90e9b3c5ef43242afc42770d03c61489d69c1de5
Merge: 7e9bb68 11b71c1
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 14:25:50 2014 -0400

    Merge branch 'master' into 3889-functional-testing


commit 7e9bb68c02ff8b21747ad88c89d79395b4c091c0
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 14:23:25 2014 -0400

    3889: Since all failing API server functional tests are fixed, update test_helper to fail any future tests that execute multiple acions in one single functional test.

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index 996d916..3413f64 100644
--- a/services/api/test/test_helper.rb
+++ b/services/api/test/test_helper.rb
@@ -88,13 +88,7 @@ class ActionController::TestCase
   def check_counter action
     @counter += 1
     if @counter == 2
-      # TODO: when existing mistakes are fixed, start failing broken
-      # test cases like this:
-      #
-      # assert_equal 1, 2, "Multiple actions in functional test"
-      #
-      # Meanwhile, just warn (just once per test case):
-      $stderr.puts " [WARNING: Multiple actions in functional test]"
+     # assert_equal 1, 2, "Multiple actions in functional test"
     end
   end
 

commit c50fe608334f9fc2e19969f41c04d671cb9c0a19
Author: radhika <radhika at curoverse.com>
Date:   Thu Sep 25 14:21:46 2014 -0400

    3889: update the test "use ownership and permission links to determine which logs a user can see" to account for the newly added log fixture.

diff --git a/services/api/test/unit/log_test.rb b/services/api/test/unit/log_test.rb
index 4fc273b..0c85d4c 100644
--- a/services/api/test/unit/log_test.rb
+++ b/services/api/test/unit/log_test.rb
@@ -220,18 +220,20 @@ class LogTest < ActiveSupport::TestCase
 
   test "use ownership and permission links to determine which logs a user can see" do
     c = Log.readable_by(users(:admin)).order("id asc").each.to_a
-    assert_equal 5, c.size
+    assert_equal 6, c.size
     assert_equal 1, c[0].id # no-op
     assert_equal 2, c[1].id # admin changes repository foo, which is owned by active user
     assert_equal 3, c[2].id # admin changes specimen owned_by_spectator
     assert_equal 4, c[3].id # foo collection added, readable by active through link
     assert_equal 5, c[4].id # baz collection added, readable by active and spectator through group 'all users' group membership
+    assert_equal 6, c[5].id # log_owned_by_active
 
     c = Log.readable_by(users(:active)).order("id asc").each.to_a
-    assert_equal 3, c.size
+    assert_equal 4, c.size
     assert_equal 2, c[0].id # admin changes repository foo, which is owned by active user
     assert_equal 4, c[1].id # foo collection added, readable by active through link
     assert_equal 5, c[2].id # baz collection added, readable by active and spectator through group 'all users' group membership
+    assert_equal 6, c[3].id # log_owned_by_active
 
     c = Log.readable_by(users(:spectator)).order("id asc").each.to_a
     assert_equal 2, c.size

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


hooks/post-receive
--