[ARVADOS] updated: 99ee07ef79d83bb1e1384e45466435ba04744e58

[Git user]

Summary of changes:
 apps/workbench/test/controllers/disabled_api_test.rb | 20 +++++++++++++++++++-
 apps/workbench/test/unit/disabled_api_test.rb        |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

       via  99ee07ef79d83bb1e1384e45466435ba04744e58 (commit)
      from  95bed05f8888fba7dffb4b409c22e6620153e1b9 (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 99ee07ef79d83bb1e1384e45466435ba04744e58
Author: radhika <radhika at curoverse.com>
Date:   Mon Nov 7 19:55:07 2016 -0500

    10310: stubbing discovery document needs deep copying.

diff --git a/apps/workbench/test/controllers/disabled_api_test.rb b/apps/workbench/test/controllers/disabled_api_test.rb
index 933acf6..bc4ce33 100644
--- a/apps/workbench/test/controllers/disabled_api_test.rb
+++ b/apps/workbench/test/controllers/disabled_api_test.rb
@@ -10,7 +10,7 @@ class DisabledApiTest < ActionController::TestCase
       @controller = ProjectsController.new
 
       if crunch2
-        dd = ArvadosApiClient.new_or_current.discovery
+        dd = ArvadosApiClient.new_or_current.discovery.deep_dup
         dd[:resources][:pipeline_instances][:methods].delete(:index)
         ArvadosApiClient.any_instance.stubs(:discovery).returns(dd)
       end
@@ -24,4 +24,22 @@ class DisabledApiTest < ActionController::TestCase
       end
     end
   end
+
+  [
+    [:jobs, JobsController.new],
+    [:job_tasks, JobTasksController.new],
+    [:pipeline_instances, PipelineInstancesController.new],
+    [:pipeline_templates, PipelineTemplatesController.new],
+  ].each do |ctrl_name, ctrl|
+    test "#{ctrl_name} index page with crunch2" do
+      @controller = ctrl
+
+      dd = ArvadosApiClient.new_or_current.discovery.deep_dup
+      dd[:resources][ctrl_name][:methods].delete(:index)
+      ArvadosApiClient.any_instance.stubs(:discovery).returns(dd)
+
+      get :index, {}, session_for(:active)
+      assert_includes @response.body, "index method is not supported for #{ctrl_name.to_s}"
+    end
+  end
 end
diff --git a/apps/workbench/test/unit/disabled_api_test.rb b/apps/workbench/test/unit/disabled_api_test.rb
index 468ab5f..52e3bd1 100644
--- a/apps/workbench/test/unit/disabled_api_test.rb
+++ b/apps/workbench/test/unit/disabled_api_test.rb
@@ -5,7 +5,7 @@ class DisabledApiTest < ActiveSupport::TestCase
     use_token(:active) do
       assert(Job.creatable?)
     end
-    dd = ArvadosApiClient.new_or_current.discovery
+    dd = ArvadosApiClient.new_or_current.discovery.deep_dup
     dd[:resources][:jobs][:methods].delete(:create)
     ArvadosApiClient.any_instance.stubs(:discovery).returns(dd)
     use_token(:active) do

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


hooks/post-receive
--