diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /spec/requests/api/lint_spec.rb | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'spec/requests/api/lint_spec.rb')
-rw-r--r-- | spec/requests/api/lint_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/requests/api/lint_spec.rb b/spec/requests/api/lint_spec.rb index cf8cac773f5..f26236e0253 100644 --- a/spec/requests/api/lint_spec.rb +++ b/spec/requests/api/lint_spec.rb @@ -166,7 +166,7 @@ RSpec.describe API::Lint do included_config = YAML.safe_load(included_content, [Symbol]) root_config = YAML.safe_load(yaml_content, [Symbol]) - expected_yaml = included_config.merge(root_config).except(:include).to_yaml + expected_yaml = included_config.merge(root_config).except(:include).deep_stringify_keys.to_yaml expect(response).to have_gitlab_http_status(:ok) expect(json_response).to be_an Hash @@ -246,7 +246,7 @@ RSpec.describe API::Lint do let(:dry_run) { false } let(:included_content) do - { another_test: { stage: 'test', script: 'echo 1' } }.to_yaml + { another_test: { stage: 'test', script: 'echo 1' } }.deep_stringify_keys.to_yaml end before do @@ -299,7 +299,7 @@ RSpec.describe API::Lint do end let(:included_content) do - { another_test: { stage: 'test', script: 'echo 1' } }.to_yaml + { another_test: { stage: 'test', script: 'echo 1' } }.deep_stringify_keys.to_yaml end before do @@ -341,7 +341,7 @@ RSpec.describe API::Lint do context 'with invalid .gitlab-ci.yml content' do let(:yaml_content) do - { image: 'ruby:2.7', services: ['postgres'] }.to_yaml + { image: 'ruby:2.7', services: ['postgres'] }.deep_stringify_keys.to_yaml end before do @@ -385,7 +385,7 @@ RSpec.describe API::Lint do included_config = YAML.safe_load(included_content, [Symbol]) root_config = YAML.safe_load(yaml_content, [Symbol]) - expected_yaml = included_config.merge(root_config).except(:include).to_yaml + expected_yaml = included_config.merge(root_config).except(:include).deep_stringify_keys.to_yaml expect(response).to have_gitlab_http_status(:ok) expect(json_response).to be_an Hash @@ -539,7 +539,7 @@ RSpec.describe API::Lint do context 'with invalid .gitlab-ci.yml content' do let(:yaml_content) do - { image: 'ruby:2.7', services: ['postgres'] }.to_yaml + { image: 'ruby:2.7', services: ['postgres'] }.deep_stringify_keys.to_yaml end context 'when running as dry run' do |