diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/config | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/config')
| -rw-r--r-- | spec/config/application_spec.rb | 2 | ||||
| -rw-r--r-- | spec/config/mail_room_spec.rb | 2 | ||||
| -rw-r--r-- | spec/config/object_store_settings_spec.rb | 2 | ||||
| -rw-r--r-- | spec/config/settings_spec.rb | 2 | ||||
| -rw-r--r-- | spec/config/smime_signature_settings_spec.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/spec/config/application_spec.rb b/spec/config/application_spec.rb index e6b8da690a2..94fecc26e7f 100644 --- a/spec/config/application_spec.rb +++ b/spec/config/application_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Application do # rubocop:disable RSpec/FilePath +RSpec.describe Gitlab::Application do # rubocop:disable RSpec/FilePath using RSpec::Parameterized::TableSyntax filtered_param = ActiveSupport::ParameterFilter::FILTERED diff --git a/spec/config/mail_room_spec.rb b/spec/config/mail_room_spec.rb index bd8269fb2c5..206f2744281 100644 --- a/spec/config/mail_room_spec.rb +++ b/spec/config/mail_room_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'mail_room.yml' do +RSpec.describe 'mail_room.yml' do include StubENV let(:mailroom_config_path) { 'config/mail_room.yml' } diff --git a/spec/config/object_store_settings_spec.rb b/spec/config/object_store_settings_spec.rb index c38910cff0a..67e77aa4466 100644 --- a/spec/config/object_store_settings_spec.rb +++ b/spec/config/object_store_settings_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require Rails.root.join('config', 'object_store_settings.rb') -describe ObjectStoreSettings do +RSpec.describe ObjectStoreSettings do describe '.parse' do it 'sets correct default values' do settings = described_class.parse(nil) diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb index 20c0b92f135..9db3d35cbe5 100644 --- a/spec/config/settings_spec.rb +++ b/spec/config/settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Settings do +RSpec.describe Settings do describe 'omniauth' do it 'defaults to enabled' do expect(described_class.omniauth.enabled).to be true diff --git a/spec/config/smime_signature_settings_spec.rb b/spec/config/smime_signature_settings_spec.rb index 7e7b42b129a..5ce6fdd975b 100644 --- a/spec/config/smime_signature_settings_spec.rb +++ b/spec/config/smime_signature_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe SmimeSignatureSettings do +RSpec.describe SmimeSignatureSettings do describe '.parse' do let(:default_smime_key) { Rails.root.join('.gitlab_smime_key') } let(:default_smime_cert) { Rails.root.join('.gitlab_smime_cert') } |