diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/lib/gitlab/config | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/lib/gitlab/config')
-rw-r--r-- | spec/lib/gitlab/config/entry/attributable_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/boolean_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/configurable_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/factory_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/simplifiable_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/undefined_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/unspecified_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/validatable_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/entry/validator_spec.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/config/loader/yaml_spec.rb | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/spec/lib/gitlab/config/entry/attributable_spec.rb b/spec/lib/gitlab/config/entry/attributable_spec.rb index 64a4670f483..1e7880ed898 100644 --- a/spec/lib/gitlab/config/entry/attributable_spec.rb +++ b/spec/lib/gitlab/config/entry/attributable_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Attributable do +RSpec.describe Gitlab::Config::Entry::Attributable do let(:node) do Class.new do include Gitlab::Config::Entry::Attributable diff --git a/spec/lib/gitlab/config/entry/boolean_spec.rb b/spec/lib/gitlab/config/entry/boolean_spec.rb index 0b8b720dd80..86cd92e22d7 100644 --- a/spec/lib/gitlab/config/entry/boolean_spec.rb +++ b/spec/lib/gitlab/config/entry/boolean_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Boolean do +RSpec.describe Gitlab::Config::Entry::Boolean do let(:entry) { described_class.new(config) } describe 'validations' do diff --git a/spec/lib/gitlab/config/entry/configurable_spec.rb b/spec/lib/gitlab/config/entry/configurable_spec.rb index 8c3a4490d08..c72efa66024 100644 --- a/spec/lib/gitlab/config/entry/configurable_spec.rb +++ b/spec/lib/gitlab/config/entry/configurable_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Configurable do +RSpec.describe Gitlab::Config::Entry::Configurable do let(:entry) do Class.new(Gitlab::Config::Entry::Node) do include Gitlab::Config::Entry::Configurable diff --git a/spec/lib/gitlab/config/entry/factory_spec.rb b/spec/lib/gitlab/config/entry/factory_spec.rb index 81ca5f2cba1..a00c45169ef 100644 --- a/spec/lib/gitlab/config/entry/factory_spec.rb +++ b/spec/lib/gitlab/config/entry/factory_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Factory do +RSpec.describe Gitlab::Config::Entry::Factory do describe '#create!' do before do stub_const('Script', Class.new(Gitlab::Config::Entry::Node)) diff --git a/spec/lib/gitlab/config/entry/simplifiable_spec.rb b/spec/lib/gitlab/config/entry/simplifiable_spec.rb index 5c208cab449..2011587a342 100644 --- a/spec/lib/gitlab/config/entry/simplifiable_spec.rb +++ b/spec/lib/gitlab/config/entry/simplifiable_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Simplifiable do +RSpec.describe Gitlab::Config::Entry::Simplifiable do describe '.strategy' do let(:entry) do Class.new(described_class) do diff --git a/spec/lib/gitlab/config/entry/undefined_spec.rb b/spec/lib/gitlab/config/entry/undefined_spec.rb index 83c3a6aec72..36faabd8e31 100644 --- a/spec/lib/gitlab/config/entry/undefined_spec.rb +++ b/spec/lib/gitlab/config/entry/undefined_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Undefined do +RSpec.describe Gitlab::Config::Entry::Undefined do let(:entry) { described_class.new } describe '#leaf?' do diff --git a/spec/lib/gitlab/config/entry/unspecified_spec.rb b/spec/lib/gitlab/config/entry/unspecified_spec.rb index 32c52594ecf..35ba992f62a 100644 --- a/spec/lib/gitlab/config/entry/unspecified_spec.rb +++ b/spec/lib/gitlab/config/entry/unspecified_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Unspecified do +RSpec.describe Gitlab::Config::Entry::Unspecified do let(:unspecified) { described_class.new(entry) } let(:entry) { spy('Entry') } diff --git a/spec/lib/gitlab/config/entry/validatable_spec.rb b/spec/lib/gitlab/config/entry/validatable_spec.rb index 925db3594ba..5e66de60367 100644 --- a/spec/lib/gitlab/config/entry/validatable_spec.rb +++ b/spec/lib/gitlab/config/entry/validatable_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Validatable do +RSpec.describe Gitlab::Config::Entry::Validatable do let(:entry) do Class.new(Gitlab::Config::Entry::Node) do include Gitlab::Config::Entry::Validatable diff --git a/spec/lib/gitlab/config/entry/validator_spec.rb b/spec/lib/gitlab/config/entry/validator_spec.rb index 7bf350912df..d41f7f794ec 100644 --- a/spec/lib/gitlab/config/entry/validator_spec.rb +++ b/spec/lib/gitlab/config/entry/validator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Entry::Validator do +RSpec.describe Gitlab::Config::Entry::Validator do let(:validator) { Class.new(described_class) } let(:validator_instance) { validator.new(node) } let(:node) { spy('node') } diff --git a/spec/lib/gitlab/config/loader/yaml_spec.rb b/spec/lib/gitlab/config/loader/yaml_spec.rb index 623fe927233..731ee12d7f4 100644 --- a/spec/lib/gitlab/config/loader/yaml_spec.rb +++ b/spec/lib/gitlab/config/loader/yaml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Config::Loader::Yaml do +RSpec.describe Gitlab::Config::Loader::Yaml do let(:loader) { described_class.new(yml) } let(:yml) do |