Commit 50bc215e authored by King Chung Huang's avatar King Chung Huang Committed by Dylan Griffith

Fix expected values for merge specs

The expected values for the recursive merge specs were missing
"variables" at the top level.
parent 73605824
...@@ -134,7 +134,7 @@ describe EE::Gitlab::Ci::Config do ...@@ -134,7 +134,7 @@ describe EE::Gitlab::Ci::Config do
it 'should merge the variables dictionaries' do it 'should merge the variables dictionaries' do
WebMock.stub_request(:get, remote_location).to_return(body: remote_file_content) WebMock.stub_request(:get, remote_location).to_return(body: remote_file_content)
expect(config.to_hash).to eq({ A: 'alpha', B: 'beta', C: 'gamma', D: 'delta' }) expect(config.to_hash).to eq({ variables: { A: 'alpha', B: 'beta', C: 'gamma', D: 'delta' }})
end end
end end
...@@ -161,7 +161,7 @@ describe EE::Gitlab::Ci::Config do ...@@ -161,7 +161,7 @@ describe EE::Gitlab::Ci::Config do
it 'later declarations should take precedence' do it 'later declarations should take precedence' do
WebMock.stub_request(:get, remote_location).to_return(body: remote_file_content) WebMock.stub_request(:get, remote_location).to_return(body: remote_file_content)
expect(config.to_hash).to eq({ A: 'alpha', B: 'beta', C: 'gamma', D: 'delta' }) expect(config.to_hash).to eq({ variables: { A: 'alpha', B: 'beta', C: 'gamma', D: 'delta' }})
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment