diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 21:17:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-24 21:17:30 +0300 |
commit | 0bf82aa5cb3b1ed826dd5c0d46331e17aa60d9e9 (patch) | |
tree | ee5a760877cce0189cc8e765a912a06942f3e4de /spec/frontend/fixtures | |
parent | efbf661c4224d481c57d0346e26983a805e5ec93 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/fixtures')
-rw-r--r-- | spec/frontend/fixtures/jobs.rb | 5 | ||||
-rw-r--r-- | spec/frontend/fixtures/prometheus_integration.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/spec/frontend/fixtures/jobs.rb b/spec/frontend/fixtures/jobs.rb index 376c04cd629..043d6a9db29 100644 --- a/spec/frontend/fixtures/jobs.rb +++ b/spec/frontend/fixtures/jobs.rb @@ -92,6 +92,11 @@ RSpec.describe 'Jobs (JavaScript fixtures)' do it_behaves_like 'graphql queries', 'pages/admin/jobs/components/table/graphql/queries', 'get_all_jobs.query.graphql' do let(:user) { create(:admin) } end + + it_behaves_like 'graphql queries', 'pages/admin/jobs/components/table/graphql/queries', 'get_cancelable_jobs_count.query.graphql' do + let(:variables) { { statuses: %w[PENDING RUNNING] } } + let(:user) { create(:admin) } + end end describe 'get_jobs_count.query.graphql', type: :request do diff --git a/spec/frontend/fixtures/prometheus_integration.rb b/spec/frontend/fixtures/prometheus_integration.rb index 13130c00118..fcba8b596a8 100644 --- a/spec/frontend/fixtures/prometheus_integration.rb +++ b/spec/frontend/fixtures/prometheus_integration.rb @@ -14,6 +14,7 @@ RSpec.describe Projects::Settings::IntegrationsController, '(JavaScript fixtures before do sign_in(user) + stub_feature_flags(remove_monitor_metrics: false) end after do |