diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /spec/lib/gitlab/merge_requests | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'spec/lib/gitlab/merge_requests')
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/lib/gitlab/merge_requests/mergeability/check_result_spec.rb b/spec/lib/gitlab/merge_requests/mergeability/check_result_spec.rb index 50cfa6b64ea..4f437e57600 100644 --- a/spec/lib/gitlab/merge_requests/mergeability/check_result_spec.rb +++ b/spec/lib/gitlab/merge_requests/mergeability/check_result_spec.rb @@ -70,8 +70,8 @@ RSpec.describe Gitlab::MergeRequests::Mergeability::CheckResult do let(:payload) { { test: 'test' } } let(:hash) do { - 'status' => status, - 'payload' => payload + status: status, + payload: payload } end diff --git a/spec/lib/gitlab/merge_requests/mergeability/redis_interface_spec.rb b/spec/lib/gitlab/merge_requests/mergeability/redis_interface_spec.rb index 2471faf76b2..787ac2874d3 100644 --- a/spec/lib/gitlab/merge_requests/mergeability/redis_interface_spec.rb +++ b/spec/lib/gitlab/merge_requests/mergeability/redis_interface_spec.rb @@ -6,7 +6,7 @@ RSpec.describe Gitlab::MergeRequests::Mergeability::RedisInterface, :clean_gitla subject(:redis_interface) { described_class.new } let(:merge_check) { double(cache_key: '13') } - let(:result_hash) { { 'test' => 'test' } } + let(:result_hash) { { test: 'test' } } let(:expected_key) { "#{merge_check.cache_key}:#{described_class::VERSION}" } describe '#save_check' do diff --git a/spec/lib/gitlab/merge_requests/mergeability/results_store_spec.rb b/spec/lib/gitlab/merge_requests/mergeability/results_store_spec.rb index 0e8b598730c..e4211c6dfd7 100644 --- a/spec/lib/gitlab/merge_requests/mergeability/results_store_spec.rb +++ b/spec/lib/gitlab/merge_requests/mergeability/results_store_spec.rb @@ -10,15 +10,15 @@ RSpec.describe Gitlab::MergeRequests::Mergeability::ResultsStore do let(:merge_request) { double } describe '#read' do - let(:result_hash) { { 'status' => 'success', 'payload' => {} } } + let(:result_hash) { { status: 'success', payload: {} } } it 'calls #retrieve_check on the interface' do expect(interface).to receive(:retrieve_check).with(merge_check: merge_check).and_return(result_hash) cached_result = results_store.read(merge_check: merge_check) - expect(cached_result.status).to eq(result_hash['status'].to_sym) - expect(cached_result.payload).to eq(result_hash['payload']) + expect(cached_result.status).to eq(result_hash[:status].to_sym) + expect(cached_result.payload).to eq(result_hash[:payload]) end context 'when #retrieve_check returns nil' do |