diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 00:08:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 00:08:43 +0300 |
commit | 59712a466f6f12acf517cdea2c4fa876f0214124 (patch) | |
tree | ba91f1d944811e9eef71bd45843797ad9989c3af /spec/lib/gitlab/config | |
parent | 2b2299ea5f8717ad59a47c1c40d951409dfeb35b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/config')
-rw-r--r-- | spec/lib/gitlab/config/entry/composable_array_spec.rb | 4 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/composable_hash_spec.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/config/entry/composable_array_spec.rb b/spec/lib/gitlab/config/entry/composable_array_spec.rb index 77766cb3b0a..d8f00476444 100644 --- a/spec/lib/gitlab/config/entry/composable_array_spec.rb +++ b/spec/lib/gitlab/config/entry/composable_array_spec.rb @@ -47,13 +47,13 @@ RSpec.describe Gitlab::Config::Entry::ComposableArray, :aggregate_failures do expect(entry[0].description).to eq('node definition') expect(entry[0].key).to eq('node') expect(entry[0].metadata).to eq({}) - expect(entry[0].parent.class).to eq(Gitlab::Config::Entry::ComposableArray) + expect(entry[0].parent.class).to eq(described_class) expect(entry[0].value).to eq(DATABASE_SECRET: 'passw0rd') expect(entry[1]).to be_a(Gitlab::Config::Entry::Node) expect(entry[1].description).to eq('node definition') expect(entry[1].key).to eq('node') expect(entry[1].metadata).to eq({}) - expect(entry[1].parent.class).to eq(Gitlab::Config::Entry::ComposableArray) + expect(entry[1].parent.class).to eq(described_class) expect(entry[1].value).to eq(API_TOKEN: 'passw0rd2') end diff --git a/spec/lib/gitlab/config/entry/composable_hash_spec.rb b/spec/lib/gitlab/config/entry/composable_hash_spec.rb index 331c9efc741..6ce66314098 100644 --- a/spec/lib/gitlab/config/entry/composable_hash_spec.rb +++ b/spec/lib/gitlab/config/entry/composable_hash_spec.rb @@ -48,19 +48,19 @@ RSpec.describe Gitlab::Config::Entry::ComposableHash, :aggregate_failures do expect(entry[:DATABASE_SECRET].description).to eq('DATABASE_SECRET node definition') expect(entry[:DATABASE_SECRET].key).to eq(:DATABASE_SECRET) expect(entry[:DATABASE_SECRET].metadata).to eq(name: :DATABASE_SECRET) - expect(entry[:DATABASE_SECRET].parent.class).to eq(Gitlab::Config::Entry::ComposableHash) + expect(entry[:DATABASE_SECRET].parent.class).to eq(described_class) expect(entry[:DATABASE_SECRET].value).to eq('passw0rd') expect(entry[:API_TOKEN]).to be_a(Gitlab::Config::Entry::Node) expect(entry[:API_TOKEN].description).to eq('API_TOKEN node definition') expect(entry[:API_TOKEN].key).to eq(:API_TOKEN) expect(entry[:API_TOKEN].metadata).to eq(name: :API_TOKEN) - expect(entry[:API_TOKEN].parent.class).to eq(Gitlab::Config::Entry::ComposableHash) + expect(entry[:API_TOKEN].parent.class).to eq(described_class) expect(entry[:API_TOKEN].value).to eq('passw0rd2') expect(entry[:ACCEPT_PASSWORD]).to be_a(Gitlab::Config::Entry::Node) expect(entry[:ACCEPT_PASSWORD].description).to eq('ACCEPT_PASSWORD node definition') expect(entry[:ACCEPT_PASSWORD].key).to eq(:ACCEPT_PASSWORD) expect(entry[:ACCEPT_PASSWORD].metadata).to eq(name: :ACCEPT_PASSWORD) - expect(entry[:ACCEPT_PASSWORD].parent.class).to eq(Gitlab::Config::Entry::ComposableHash) + expect(entry[:ACCEPT_PASSWORD].parent.class).to eq(described_class) expect(entry[:ACCEPT_PASSWORD].value).to eq(false) end |