4036: update combine collection tests to expect the newly created collection in the...

[arvados.git] / apps / workbench / test / functional / collections_controller_test.rb

diff --git a/apps/workbench/test/functional/collections_controller_test.rb b/apps/workbench/test/functional/collections_controller_test.rb
index 9e668a8c688a221cb1bd1bcadfa41ec02e2b6a37..b334f9ff27588466af047b938e7d1d3e9f78d972 100644 (file)
--- a/apps/workbench/test/functional/collections_controller_test.rb
+++ b/apps/workbench/test/functional/collections_controller_test.rb
@@ -19,13 +19,6 @@ class CollectionsControllerTest < ActionController::TestCase
     params
   end
 
-  def expected_contents(params, token)
-    unless token.is_a? String
-      token = params[:api_token] || token[:arvados_api_token]
-    end
-    [token, params[:uuid], params[:file]].join('/')
-  end
-
   def assert_hash_includes(actual_hash, expected_hash, msg=nil)
     expected_hash.each do |key, value|
       assert_equal(value, actual_hash[key], msg)
@@ -170,6 +163,10 @@ class CollectionsControllerTest < ActionController::TestCase
 
   test "inactive user can retrieve user agreement" do
     ua_collection = api_fixture('collections')['user_agreement']
+    # Here we don't test whether the agreement can be retrieved from
+    # Keep. We only test that show_file decides to send file content,
+    # so we use the file content stub.
+    stub_file_content
     get :show_file, {
       uuid: ua_collection['uuid'],
       file: ua_collection['manifest_text'].match(/ \d+:\d+:(\S+)/)[1]