X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3e7478a9a822686e1b5291fb0909a2ee2fcfeace..488a811374ff4bdeed9f2f2f57d9ef31d9369b5b:/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb?ds=sidebyside

diff --git a/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb b/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb
index 1cd3f2d00d..bfecf54d44 100644
--- a/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/job_reuse_controller_test.rb
@@ -7,9 +7,12 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   # See git_setup.rb for the commit log for test.git.tar
   include GitSetup
 
-  test "reuse job with no_reuse=false" do
+  setup do
     @controller = Arvados::V1::JobsController.new
     authorize_with :active
+  end
+
+  test "reuse job with no_reuse=false" do
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -28,8 +31,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "reuse job with find_or_create=true" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, {
       job: {
         script: "hash",
@@ -50,8 +51,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "do not reuse job because no_reuse=true" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, {
       job: {
         no_reuse: true,
@@ -72,8 +71,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "do not reuse job because find_or_create=false" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, {
       job: {
         script: "hash",
@@ -94,8 +91,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_no_output" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -113,8 +108,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_reuse_job_range" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -133,9 +126,25 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
     assert_equal '4fe459abe02d9b365932b8f5dc419439ab4e2577', new_job['script_version']
   end
 
+  test "cannot_reuse_job_no_minimum_given_so_must_use_specified_commit" do
+    post :create, job: {
+      no_reuse: false,
+      script: "hash",
+      script_version: "master",
+      repository: "foo",
+      script_parameters: {
+        input: 'fa7aeb5140e2848d39b416daeef4ffc5+45',
+        an_integer: '1'
+      }
+    }
+    assert_response :success
+    assert_not_nil assigns(:object)
+    new_job = JSON.parse(@response.body)
+    assert_not_equal 'zzzzz-8i9sb-cjs4pklxxjykqqq', new_job['uuid']
+    assert_equal '077ba2ad3ea24a929091a9e6ce545c93199b8e57', new_job['script_version']
+  end
+
   test "test_cannot_reuse_job_different_input" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -154,8 +163,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_different_version" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -174,8 +181,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_can_reuse_job_submitted_nondeterministic" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -195,8 +200,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_past_nondeterministic" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash2",
@@ -215,7 +218,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_no_permission" do
-    @controller = Arvados::V1::JobsController.new
     authorize_with :spectator
     post :create, job: {
       no_reuse: false,
@@ -235,8 +237,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "test_cannot_reuse_job_excluded" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, job: {
       no_reuse: false,
       script: "hash",
@@ -257,8 +257,6 @@ class Arvados::V1::JobReuseControllerTest < ActionController::TestCase
   end
 
   test "cannot reuse job with find_or_create but excluded version" do
-    @controller = Arvados::V1::JobsController.new
-    authorize_with :active
     post :create, {
       job: {
         script: "hash",