diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-29 15:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-29 15:08:48 +0300 |
commit | e5f2a04e9d54615fded2ca05d0d5eef464795a8f (patch) | |
tree | 5412fccdb0a63b449fba4d7998eaa05ca70091ba /spec/controllers/projects | |
parent | ad2789aeba21edaadcbdc06523462e6fd87d4ba1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/pipelines_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/controllers/projects/settings/access_tokens_controller_spec.rb | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index a80c5fa82f6..c3e29f45ac9 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -284,10 +284,6 @@ RSpec.describe Projects::PipelinesController do subject { project.namespace } - context 'pipeline_empty_state_templates experiment' do - it_behaves_like 'tracks assignment and records the subject', :pipeline_empty_state_templates, :namespace - end - context 'code_quality_walkthrough experiment' do it_behaves_like 'tracks assignment and records the subject', :code_quality_walkthrough, :namespace end diff --git a/spec/controllers/projects/settings/access_tokens_controller_spec.rb b/spec/controllers/projects/settings/access_tokens_controller_spec.rb index 2a7e3d0b322..834a9e276f9 100644 --- a/spec/controllers/projects/settings/access_tokens_controller_spec.rb +++ b/spec/controllers/projects/settings/access_tokens_controller_spec.rb @@ -61,6 +61,14 @@ RSpec.describe Projects::Settings::AccessTokensController do expect { subject }.not_to change { User.count } end end + + context 'with custom access level' do + let(:access_token_params) { { name: 'Nerd bot', scopes: ["api"], expires_at: Date.today + 1.month, access_level: 20 } } + + subject { post :create, params: { namespace_id: project.namespace, project_id: project }.merge(project_access_token: access_token_params) } + + it_behaves_like 'project access tokens available #create' + end end describe '#revoke', :sidekiq_inline do |