X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f91c73aba940adf1e9fbd530d102931af45a63c5..2fccbc1d172fe4bd680651261adfdca8f1ba2a63:/services/api/test/functional/arvados/v1/jobs_controller_test.rb?ds=sidebyside

diff --git a/services/api/test/functional/arvados/v1/jobs_controller_test.rb b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
index d671e949ff..86b45952d3 100644
--- a/services/api/test/functional/arvados/v1/jobs_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/jobs_controller_test.rb
@@ -1,9 +1,9 @@
 require 'test_helper'
-load 'test/functional/arvados/v1/git_setup.rb'
+require 'helpers/git_test_helper'
 
 class Arvados::V1::JobsControllerTest < ActionController::TestCase
 
-  include GitSetup
+  include GitTestHelper
 
   test "submit a job" do
     authorize_with :active
@@ -178,39 +178,37 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
   end
 
   test "search jobs by uuid with 'not in' query" do
+    exclude_uuids = [jobs(:running).uuid,
+                     jobs(:running_cancelled).uuid]
     authorize_with :active
     get :index, {
-      filters: [['uuid', 'not in', ['zzzzz-8i9sb-pshmckwoma9plh7']]]
+      filters: [['uuid', 'not in', exclude_uuids]]
     }
     assert_response :success
     found = assigns(:objects).collect(&:uuid)
-    assert_not_equal [], found, "'not in' query returned nothing"
-    assert_not_includes found, 'zzzzz-8i9sb-pshmckwoma9plh7',
-    "'not in' query returned the very thing I did not want"
+    assert_not_empty found, "'not in' query returned nothing"
+    assert_empty(found & exclude_uuids,
+                 "'not in' query returned uuids I asked not to get")
   end
 
-  test "search jobs by uuid with '!=' query" do
-    authorize_with :active
-    get :index, {
-      filters: [['uuid', '!=', 'zzzzz-8i9sb-pshmckwoma9plh7']]
-    }
-    assert_response :success
-    found = assigns(:objects).collect(&:uuid)
-    assert_not_equal [], found, "'!=' query returned nothing"
-    assert_not_includes found, 'zzzzz-8i9sb-pshmckwoma9plh7',
-    "'!=' query returned the very thing I did not want"
-  end
-
-  test "search jobs by output with '!= nil' query" do
-    authorize_with :active
-    get :index, {
-      filters: [['output', '!=', nil]]
-    }
-    assert_response :success
-    found = assigns(:objects).collect(&:output)
-    assert_not_equal [], found, "'!= nil' query returned nothing"
-    assert_not_includes found, nil,
-    "'!= nil' query returned the very thing I did not want"
+  ['=', '!='].each do |operator|
+    [['uuid', 'zzzzz-8i9sb-pshmckwoma9plh7'],
+     ['output', nil]].each do |attr, operand|
+      test "search jobs with #{attr} #{operator} #{operand.inspect} query" do
+        authorize_with :active
+        get :index, {
+          filters: [[attr, operator, operand]]
+        }
+        assert_response :success
+        values = assigns(:objects).collect { |x| x.send(attr) }
+        assert_not_empty values, "query should return non-empty result"
+        if operator == '='
+          assert_empty values - [operand], "query results do not satisfy query"
+        else
+          assert_empty values & [operand], "query results do not satisfy query"
+        end
+      end
+    end
   end
 
   test "search jobs by started_at with < query" do
@@ -287,4 +285,19 @@ class Arvados::V1::JobsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  [:active, :admin].each do |which_token|
+    test "get job queue as #{which_token} user" do
+      authorize_with which_token
+      get :queue
+      assert_response :success
+      assert_operator 1, :<=, assigns(:objects).count
+    end
+    test "get job queue as #{which_token} user, with a filter" do
+      authorize_with which_token
+      get :queue, { filters: [['script','=','foo']] }
+      assert_response :success
+      assert_equal ['foo'], assigns(:objects).collect(&:script).uniq
+    end
+  end
+
 end