diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-14 00:09:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-14 00:09:09 +0300 |
commit | 04cc87ee46c1c0b6b4eb7df964b3115dd2578877 (patch) | |
tree | 2c64b0e21804fc0981a2142eb83a0b73d85fbcda /spec/requests | |
parent | 4a064b8dc0bf350b1b3000698042b49113e758d1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/graphql/mutations/snippets/create_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/graphql/mutations/work_items/update_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/pages_domains_spec.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/requests/api/graphql/mutations/snippets/create_spec.rb b/spec/requests/api/graphql/mutations/snippets/create_spec.rb index 0f02b1b4f23..a6d727ae6d3 100644 --- a/spec/requests/api/graphql/mutations/snippets/create_spec.rb +++ b/spec/requests/api/graphql/mutations/snippets/create_spec.rb @@ -178,7 +178,7 @@ RSpec.describe 'Creating a Snippet', feature_category: :source_code_management d it 'returns an error' do subject - expect(json_response['errors']).to be + expect(json_response['errors']).to be_present end end end diff --git a/spec/requests/api/graphql/mutations/work_items/update_spec.rb b/spec/requests/api/graphql/mutations/work_items/update_spec.rb index ce1c2c01faa..60b5795ee9b 100644 --- a/spec/requests/api/graphql/mutations/work_items/update_spec.rb +++ b/spec/requests/api/graphql/mutations/work_items/update_spec.rb @@ -869,7 +869,7 @@ RSpec.describe 'Update a work item', feature_category: :team_planning do let_it_be(:issue) { create(:work_item, project: project) } let_it_be(:link) { create(:parent_link, work_item_parent: issue, work_item: work_item) } - let(:error_msg) { 'Work item type cannot be changed to Issue with Issue as parent type.' } + let(:error_msg) { 'Work item type cannot be changed to issue when linked to a parent issue.' } it 'does not update the work item type' do expect do diff --git a/spec/requests/api/pages_domains_spec.rb b/spec/requests/api/pages_domains_spec.rb index 9ca027c2edc..42d83ff8139 100644 --- a/spec/requests/api/pages_domains_spec.rb +++ b/spec/requests/api/pages_domains_spec.rb @@ -440,8 +440,8 @@ RSpec.describe API::PagesDomains, feature_category: :pages do expect(response).to have_gitlab_http_status(:ok) expect(response).to match_response_schema('public_api/v4/pages_domain/detail') expect(pages_domain_with_letsencrypt.auto_ssl_enabled).to be false - expect(pages_domain_with_letsencrypt.key).to be - expect(pages_domain_with_letsencrypt.certificate).to be + expect(pages_domain_with_letsencrypt.key).to be_present + expect(pages_domain_with_letsencrypt.certificate).to be_present end it 'updates pages domain with expired certificate', :aggregate_failures do |