[ARVADOS] updated: 94e9d86f85c808e905269cde830341823b1c614b

[git at public.curoverse.com]

Summary of changes:
 .../test/controllers/collections_controller_test.rb       | 15 ---------------
 .../controllers/pipeline_instances_controller_test.rb     | 15 ---------------
 apps/workbench/test/test_helper.rb                        | 15 +++++++++++++++
 services/api/test/fixtures/collections.yml                |  6 +++---
 services/api/test/fixtures/jobs.yml                       |  2 +-
 5 files changed, 19 insertions(+), 34 deletions(-)

       via  94e9d86f85c808e905269cde830341823b1c614b (commit)
      from  b798b325087c82578b4b079df968ad844a93dfb3 (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 94e9d86f85c808e905269cde830341823b1c614b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Nov 4 10:15:16 2014 -0500

    4031: Fix tests.  Move RequestDuck to test_helper.rb so as not to duplicate code.

diff --git a/apps/workbench/test/controllers/collections_controller_test.rb b/apps/workbench/test/controllers/collections_controller_test.rb
index f4d9c49..a5c6033 100644
--- a/apps/workbench/test/controllers/collections_controller_test.rb
+++ b/apps/workbench/test/controllers/collections_controller_test.rb
@@ -3,21 +3,6 @@ require 'test_helper'
 class CollectionsControllerTest < ActionController::TestCase
   include PipelineInstancesHelper
 
-  class RequestDuck
-    def self.host
-      "localhost"
-    end
-
-    def self.port
-      8080
-    end
-
-    def self.protocol
-      "http"
-    end
-  end
-
-
   test 'provenance graph' do
     use_token 'admin'
 
diff --git a/apps/workbench/test/controllers/pipeline_instances_controller_test.rb b/apps/workbench/test/controllers/pipeline_instances_controller_test.rb
index 718b5c4..b518b07 100644
--- a/apps/workbench/test/controllers/pipeline_instances_controller_test.rb
+++ b/apps/workbench/test/controllers/pipeline_instances_controller_test.rb
@@ -38,21 +38,6 @@ class PipelineInstancesControllerTest < ActionController::TestCase
     assert_equal 6, determine_wallclock_runtime(r)
   end
 
-
-  class RequestDuck
-    def self.host
-      "localhost"
-    end
-
-    def self.port
-      8080
-    end
-
-    def self.protocol
-      "http"
-    end
-  end
-
   test "generate graph" do
 
     use_token 'admin'
diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 89341a6..49b9c7f 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -190,6 +190,21 @@ class ActionController::TestCase
   end
 end
 
+# If it quacks like a duck, it must be a HTTP request object.
+class RequestDuck
+  def self.host
+    "localhost"
+  end
+
+  def self.port
+    8080
+  end
+
+  def self.protocol
+    "http"
+  end
+end
+
 if ENV["RAILS_ENV"].eql? 'test'
   ApiServerForTests.run
 end
diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index daa421c..f461449 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -289,9 +289,9 @@ graph_test_collection1:
 graph_test_collection2:
   uuid: zzzzz-4zz18-uukreo9rbgwsujx
   owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
-  portable_data_hash: b519d9cb706a29fc7ea24dbea2f05851+93
-  manifest_text: ". 6a4ff0499484c6c79c95cd8c566bd25f+249025 0:249025:GNU_General_Public_License,_version_3.pdf\n"
-  name: "GNU General Public License, version 3"
+  portable_data_hash: 65b17c95fdbc9800fc48acda4e9dcd0b+93
+  manifest_text: ". 6a4ff0499484c6c79c95cd8c566bd25f+249025 0:249025:FOO_General_Public_License,_version_3.pdf\n"
+  name: "FOO General Public License, version 3"
 
 graph_test_collection3:
   uuid: zzzzz-4zz18-uukreo9rbgwsujj
diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index 875c8df..ebcecf4 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -316,7 +316,7 @@ graph_stage2:
   script_parameters:
     input: fa7aeb5140e2848d39b416daeef4ffc5+45
     input2: "stuff"
-  output: b519d9cb706a29fc7ea24dbea2f05851+93
+  output: 65b17c95fdbc9800fc48acda4e9dcd0b+93
 
 graph_stage3:
   uuid: zzzzz-8i9sb-graphstage30000

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


hooks/post-receive
--