[ARVADOS] updated: 1d20cb1d8ff6c4ba678fb5387265f99b4912a028

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.default.yml      |  2 +-
 apps/workbench/config/initializers/mime_types.rb   |  2 +-
 .../test/helpers/collections_helper_test.rb        | 34 ++++++++++++++++++++
 apps/workbench/test/unit/collection_test.rb        | 33 --------------------
 ...tion_portable_data_hash_with_hinted_manifest.rb | 36 ++++++++++++++--------
 5 files changed, 59 insertions(+), 48 deletions(-)
 create mode 100644 apps/workbench/test/helpers/collections_helper_test.rb

       via  1d20cb1d8ff6c4ba678fb5387265f99b4912a028 (commit)
       via  2fdfdc0a6c8fe550f225cbc16e1582406050cd83 (commit)
       via  cb152be857f9fe25e039202af217656c0ca444d2 (commit)
       via  d9561b0197cba4a9a0f70929eb03c892df5c4543 (commit)
       via  a307f4b97a91ae47e3498dac36d0a47b1c0eedcd (commit)
       via  7e5416c8d769fa6520dad72cd0612f1776d88219 (commit)
       via  1d0aef8fb7bdad6d28976255919f58b719a4342b (commit)
      from  4a8dc955e10f0d27afa6a704843d49326bd8d3b5 (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 1d20cb1d8ff6c4ba678fb5387265f99b4912a028
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Sat Mar 21 06:42:04 2015 -0400

    5375: small updates on comments

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index d87ca9b..1851de0 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -189,7 +189,7 @@ common:
   email_from: arvados at example.com
 
   # Mimetypes of applications for which the view icon
-  # would be shown in collection show page.
+  # would be enabled in a collection's show page.
   # It is sufficient to list only applications here.
   # No need to list text and image types.
   application_mimetypes_with_view_icon: [fasta, go, json, pdf, python, r, sam, sh, xml, xsl]
diff --git a/apps/workbench/config/initializers/mime_types.rb b/apps/workbench/config/initializers/mime_types.rb
index 6dd0eae..13d15e2 100644
--- a/apps/workbench/config/initializers/mime_types.rb
+++ b/apps/workbench/config/initializers/mime_types.rb
@@ -4,7 +4,7 @@
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
 
-# add new mime types to register
+# add new mime types to MIME from mime_types gem
 
 require 'mime/types'
 include MIME

commit 2fdfdc0a6c8fe550f225cbc16e1582406050cd83
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Mar 20 23:14:43 2015 -0400

    5375: and add the new test file

diff --git a/apps/workbench/test/helpers/collections_helper_test.rb b/apps/workbench/test/helpers/collections_helper_test.rb
new file mode 100644
index 0000000..e7accad
--- /dev/null
+++ b/apps/workbench/test/helpers/collections_helper_test.rb
@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class CollectionsHelperTest < ActionView::TestCase
+  [
+    ["filename.csv", true],
+    ["filename.fa", true],
+    ["filename.fasta", true],
+    ["filename.seq", true],   # another fasta extension
+    ["filename.go", true],
+    ["filename.htm", true],
+    ["filename.html", true],
+    ["filename.json", true],
+    ["filename.md", true],
+    ["filename.pdf", true],
+    ["filename.py", true],
+    ["filename.R", true],
+    ["filename.sam", true],
+    ["filename.sh", true],
+    ["filename.txt", true],
+    ["filename.tiff", true],
+    ["filename.tsv", true],
+    ["filename.vcf", true],
+    ["filename.xml", true],
+    ["filename.xsl", true],
+    ["filename.yml", true],
+
+    ["filename.bam", false],
+    ["filename", false],
+  ].each do |file_name, preview_allowed|
+    test "verify '#{file_name}' is allowed for preview #{preview_allowed}" do
+      assert_equal preview_allowed, preview_allowed_for(file_name)
+    end
+  end
+end

commit cb152be857f9fe25e039202af217656c0ca444d2
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Mar 20 23:11:34 2015 -0400

    5375: move the mime type tests into a new collections_helper_test.

diff --git a/apps/workbench/test/unit/collection_test.rb b/apps/workbench/test/unit/collection_test.rb
index e7afa69..e71f966 100644
--- a/apps/workbench/test/unit/collection_test.rb
+++ b/apps/workbench/test/unit/collection_test.rb
@@ -1,8 +1,6 @@
 require 'test_helper'
 
 class CollectionTest < ActiveSupport::TestCase
-  include CollectionsHelper
-
   test 'recognize empty blob locator' do
     ['d41d8cd98f00b204e9800998ecf8427e+0',
      'd41d8cd98f00b204e9800998ecf8427e',
@@ -73,35 +71,4 @@ class CollectionTest < ActiveSupport::TestCase
              .attribute_editable?("name"),
            "project viewer allowed to edit collection name")
   end
-
-  [
-    ["filename.csv", true],
-    ["filename.fa", true],
-    ["filename.fasta", true],
-    ["filename.seq", true],   # another fasta extension
-    ["filename.go", true],
-    ["filename.htm", true],
-    ["filename.html", true],
-    ["filename.json", true],
-    ["filename.md", true],
-    ["filename.pdf", true],
-    ["filename.py", true],
-    ["filename.R", true],
-    ["filename.sam", true],
-    ["filename.sh", true],
-    ["filename.txt", true],
-    ["filename.tiff", true],
-    ["filename.tsv", true],
-    ["filename.vcf", true],
-    ["filename.xml", true],
-    ["filename.xsl", true],
-    ["filename.yml", true],
-
-    ["filename.bam", false],
-    ["filename", false],
-  ].each do |file_name, preview_allowed|
-    test "verify '#{file_name}' is allowed for preview #{preview_allowed}" do
-      assert_equal preview_allowed, preview_allowed_for(file_name)
-    end
-  end
 end

commit d9561b0197cba4a9a0f70929eb03c892df5c4543
Merge: 4a8dc95 a307f4b
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Fri Mar 20 23:01:04 2015 -0400

    Merge branch 'master' into 5375-preview-collection-text-files


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


hooks/post-receive
--