Add latest changes from gitlab-org/gitlab@master

4 files changed, 18 insertions, 3 deletions

diff --git a/spec/requests/api/graphql/project/work_items_spec.rb b/spec/requests/api/graphql/project/work_items_spec.rb
index 66742fcbeb6..6ef28392b8b 100644
--- a/spec/requests/api/graphql/project/work_items_spec.rb
+++ b/spec/requests/api/graphql/project/work_items_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'getting an work item list for a project' do
     <<~QUERY
     edges {
       node {
-        #{all_graphql_fields_for('workItems'.classify)}
+        #{all_graphql_fields_for('workItems'.classify, max_depth: 2)}
       }
     }
     QUERY
diff --git a/spec/requests/api/graphql/work_item_spec.rb b/spec/requests/api/graphql/work_item_spec.rb
index 217d93535ea..34644e5893a 100644
--- a/spec/requests/api/graphql/work_item_spec.rb
+++ b/spec/requests/api/graphql/work_item_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe 'Query.work_item(id)' do
 
   let(:current_user) { developer }
   let(:work_item_data) { graphql_data['workItem'] }
-  let(:work_item_fields) { all_graphql_fields_for('WorkItem') }
+  let(:work_item_fields) { all_graphql_fields_for('WorkItem', max_depth: 2) }
   let(:global_id) { work_item.to_gid.to_s }
 
   let(:query) do
@@ -52,7 +52,8 @@ RSpec.describe 'Query.work_item(id)' do
         'title' => work_item.title,
         'confidential' => work_item.confidential,
         'workItemType' => hash_including('id' => work_item.work_item_type.to_gid.to_s),
-        'userPermissions' => { 'readWorkItem' => true, 'updateWorkItem' => true, 'deleteWorkItem' => false }
+        'userPermissions' => { 'readWorkItem' => true, 'updateWorkItem' => true, 'deleteWorkItem' => false },
+        'project' => hash_including('id' => project.to_gid.to_s, 'fullPath' => project.full_path)
       )
     end
 
diff --git a/spec/requests/api/internal/workhorse_spec.rb b/spec/requests/api/internal/workhorse_spec.rb
index d40c14cc0fd..bcf63bf7c2f 100644
--- a/spec/requests/api/internal/workhorse_spec.rb
+++ b/spec/requests/api/internal/workhorse_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe API::Internal::Workhorse, :allow_forgery_protection do
         end
 
         it { expect_status(:success) }
+
         it 'returns the temp upload path' do
           subject
           expect(json_response['TempPath']).to eq(Rails.root.join('tmp/tests/public/uploads/tmp').to_s)
diff --git a/spec/requests/jwt_controller_spec.rb b/spec/requests/jwt_controller_spec.rb
index 70097234762..db3be617a53 100644
--- a/spec/requests/jwt_controller_spec.rb
+++ b/spec/requests/jwt_controller_spec.rb
@@ -22,6 +22,17 @@ RSpec.describe JwtController do
     end
   end
 
+  shared_examples 'a token that expires today' do
+    let(:pat) { create(:personal_access_token, user: user, scopes: ['api'], expires_at: Date.today ) }
+    let(:headers) { { authorization: credentials('personal_access_token', pat.token) } }
+
+    it 'fails authentication' do
+      get '/jwt/auth', params: parameters, headers: headers
+
+      expect(response).to have_gitlab_http_status(:unauthorized)
+    end
+  end
+
   context 'authenticating against container registry' do
     context 'existing service' do
       subject! { get '/jwt/auth', params: parameters }
@@ -104,6 +115,7 @@ RSpec.describe JwtController do
 
           it_behaves_like 'rejecting a blocked user'
           it_behaves_like 'user logging'
+          it_behaves_like 'a token that expires today'
         end
       end
 
@@ -253,6 +265,7 @@ RSpec.describe JwtController do
       let(:credential_password) { personal_access_token.token }
 
       it_behaves_like 'with valid credentials'
+      it_behaves_like 'a token that expires today'
     end
 
     context 'with user credentials token' do