X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0ecbb08536d02433272e62cf1878edd7927f66e1..f69d2824c997c53caa11d30ba816768bad52e12b:/apps/workbench/test/controllers/actions_controller_test.rb

diff --git a/apps/workbench/test/controllers/actions_controller_test.rb b/apps/workbench/test/controllers/actions_controller_test.rb
index 0e28b064e1..26ef67bcb9 100644
--- a/apps/workbench/test/controllers/actions_controller_test.rb
+++ b/apps/workbench/test/controllers/actions_controller_test.rb
@@ -21,7 +21,60 @@ class ActionsControllerTest < ActionController::TestCase
            selection: ['zzzzz-4zz18-znfnqtbbv4spc3w/foo',
                        'zzzzz-4zz18-ehbhgtheo8909or/bar',
                        'zzzzz-4zz18-y9vne9npefyxh8g/baz',
-                       '1fd08fc162a5c6413070a8bd0bffc818+150'],
+                       '7a6ef4c162a5c6413070a8bd0bffc818+150'],
+           format: "json"},
+         session_for(:active))
+
+    assert_response 302   # collection created and redirected to new collection page
+
+    assert_includes(response.headers['Location'], '/collections/')
+    new_collection_uuid = response.headers['Location'].split('/')[-1]
+
+    use_token :active
+    collection = Collection.select([:uuid, :manifest_text]).where(uuid: new_collection_uuid).first
+    manifest_text = collection['manifest_text']
+    assert_includes(manifest_text, "foo")
+    assert_includes(manifest_text, "bar")
+    assert_includes(manifest_text, "baz")
+    assert_includes(manifest_text, "0:0:file1 0:0:file2 0:0:file3")
+    assert_includes(manifest_text, "dir1/subdir")
+    assert_includes(manifest_text, "dir2")
+  end
+
+  test "combine files  with repeated names into new collection" do
+    post(:combine_selected_files_into_collection, {
+           selection: ['zzzzz-4zz18-znfnqtbbv4spc3w/foo',
+                       'zzzzz-4zz18-00000nonamecoll/foo',
+                       'zzzzz-4zz18-abcd6fx123409f7/foo',
+                       'zzzzz-4zz18-ehbhgtheo8909or/bar',
+                       'zzzzz-4zz18-y9vne9npefyxh8g/baz',
+                       '7a6ef4c162a5c6413070a8bd0bffc818+150'],
+           format: "json"},
+         session_for(:active))
+
+    assert_response 302   # collection created and redirected to new collection page
+
+    assert_includes(response.headers['Location'], '/collections/')
+    new_collection_uuid = response.headers['Location'].split('/')[-1]
+
+    use_token :active
+    collection = Collection.select([:uuid, :manifest_text]).where(uuid: new_collection_uuid).first
+    manifest_text = collection['manifest_text']
+    assert_includes(manifest_text, "foo(1)")
+    assert_includes(manifest_text, "foo(2)")
+    assert_includes(manifest_text, "bar")
+    assert_includes(manifest_text, "baz")
+    assert_includes(manifest_text, "0:0:file1 0:0:file2 0:0:file3")
+    assert_includes(manifest_text, "dir1/subdir")
+    assert_includes(manifest_text, "dir2")
+  end
+
+  test "combine collections with repeated filenames in almost similar directories and expect files with proper suffixes" do
+    post(:combine_selected_files_into_collection, {
+           selection: ['zzzzz-4zz18-duplicatenames1',
+                       'zzzzz-4zz18-duplicatenames2',
+                       'zzzzz-4zz18-znfnqtbbv4spc3w/foo',
+                       'zzzzz-4zz18-00000nonamecoll/foo',],
            format: "json"},
          session_for(:active))
 
@@ -33,13 +86,78 @@ class ActionsControllerTest < ActionController::TestCase
     use_token :active
     collection = Collection.select([:uuid, :manifest_text]).where(uuid: new_collection_uuid).first
     manifest_text = collection['manifest_text']
-    assert manifest_text.include?('foo'), 'Not found foo in new collection manifest text'
-    assert manifest_text.include?('bar'), 'Not found bar in new collection manifest text'
-    assert manifest_text.include?('baz'), 'Not found baz in new collection manifest text'
-    assert manifest_text.include?('0:0:file1 0:0:file2 0:0:file3'),
-                'Not found 0:0:file1 0:0:file2 0:0:file3 in new collection manifest text'
-    assert manifest_text.include?('dir1/subdir'), 'Not found dir1/subdir in new collection manifest text'
-    assert manifest_text.include?('dir2'), 'Not found dir2 in new collection manifest text'
+
+    assert_includes(manifest_text, 'foo')
+    assert_includes(manifest_text, 'foo(1)')
+
+    streams = manifest_text.split "\n"
+    streams.each do |stream|
+      if stream.start_with? './dir1'
+        # dir1 stream
+        assert_includes(stream, ':alice(1)')
+        assert_includes(stream, ':alice.txt')
+        assert_includes(stream, ':alice(1).txt')
+        assert_includes(stream, ':bob.txt')
+        assert_includes(stream, ':carol.txt')
+      elsif stream.start_with? './dir2'
+        # dir2 stream
+        assert_includes(stream, ':alice.txt')
+        assert_includes(stream, ':alice(1).txt')
+      elsif stream.start_with? '. '
+        # . stream
+        assert_includes(stream, ':foo')
+        assert_includes(stream, ':foo(1)')
+      end
+    end
   end
 
+  test "combine collections with same filename in two different streams and expect no suffixes for filenames" do
+    post(:combine_selected_files_into_collection, {
+           selection: ['zzzzz-4zz18-znfnqtbbv4spc3w',
+                       'zzzzz-4zz18-foonbarfilesdir'],
+           format: "json"},
+         session_for(:active))
+
+    assert_response 302   # collection created and redirected to new collection page
+
+    assert_includes(response.headers['Location'], '/collections/')
+    new_collection_uuid = response.headers['Location'].split('/')[-1]
+
+    use_token :active
+    collection = Collection.select([:uuid, :manifest_text]).where(uuid: new_collection_uuid).first
+    manifest_text = collection['manifest_text']
+
+    streams = manifest_text.split "\n"
+    assert_equal 2, streams.length
+    streams.each do |stream|
+      if stream.start_with? './dir1'
+        assert_includes(stream, 'foo')
+      elsif stream.start_with? '. '
+        assert_includes(stream, 'foo')
+      end
+    end
+    refute_includes(manifest_text, 'foo(1)')
+  end
+
+  test "combine foo files from two different collection streams and expect proper filename suffixes" do
+    post(:combine_selected_files_into_collection, {
+           selection: ['zzzzz-4zz18-znfnqtbbv4spc3w/foo',
+                       'zzzzz-4zz18-foonbarfilesdir/dir1/foo'],
+           format: "json"},
+         session_for(:active))
+
+    assert_response 302   # collection created and redirected to new collection page
+
+    assert_includes(response.headers['Location'], '/collections/')
+    new_collection_uuid = response.headers['Location'].split('/')[-1]
+
+    use_token :active
+    collection = Collection.select([:uuid, :manifest_text]).where(uuid: new_collection_uuid).first
+    manifest_text = collection['manifest_text']
+
+    streams = manifest_text.split "\n"
+    assert_equal 1, streams.length, "Incorrect number of streams in #{manifest_text}"
+    assert_includes(manifest_text, 'foo')
+    assert_includes(manifest_text, 'foo(1)')
+  end
 end