Commit 5fd6326e authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'issue_344279_delete_spec' into 'master'

Fix Style/OpenStructUse offenses in auth provider specs

See merge request gitlab-org/gitlab!75277
parents 6f8ad5c5 cad9f4cc
...@@ -21,7 +21,6 @@ Style/OpenStructUse: ...@@ -21,7 +21,6 @@ Style/OpenStructUse:
- spec/graphql/mutations/commits/create_spec.rb - spec/graphql/mutations/commits/create_spec.rb
- spec/helpers/application_settings_helper_spec.rb - spec/helpers/application_settings_helper_spec.rb
- spec/helpers/profiles_helper_spec.rb - spec/helpers/profiles_helper_spec.rb
- spec/lib/gitlab/auth/o_auth/provider_spec.rb
- spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb - spec/lib/gitlab/gitaly_client/blobs_stitcher_spec.rb
- spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb - spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
- spec/lib/gitlab/legacy_github_import/project_creator_spec.rb - spec/lib/gitlab/legacy_github_import/project_creator_spec.rb
......
...@@ -62,7 +62,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do ...@@ -62,7 +62,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do
context 'for an OmniAuth provider' do context 'for an OmniAuth provider' do
before do before do
provider = OpenStruct.new( provider = ActiveSupport::InheritableOptions.new(
name: 'google_oauth2', name: 'google_oauth2',
app_id: 'asd123', app_id: 'asd123',
app_secret: 'asd123' app_secret: 'asd123'
...@@ -74,7 +74,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do ...@@ -74,7 +74,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do
subject { described_class.config_for('google_oauth2') } subject { described_class.config_for('google_oauth2') }
it 'returns the config' do it 'returns the config' do
expect(subject).to be_a(OpenStruct) expect(subject).to be_a(ActiveSupport::InheritableOptions)
end end
it 'merges defaults with the given configuration' do it 'merges defaults with the given configuration' do
...@@ -98,7 +98,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do ...@@ -98,7 +98,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do
context 'when configuration specifies a custom label' do context 'when configuration specifies a custom label' do
let(:name) { 'google_oauth2' } let(:name) { 'google_oauth2' }
let(:label) { 'Custom Google Provider' } let(:label) { 'Custom Google Provider' }
let(:provider) { OpenStruct.new({ 'name' => name, 'label' => label }) } let(:provider) { ActiveSupport::InheritableOptions.new(name: name, label: label) }
before do before do
stub_omniauth_setting(providers: [provider]) stub_omniauth_setting(providers: [provider])
...@@ -110,7 +110,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do ...@@ -110,7 +110,7 @@ RSpec.describe Gitlab::Auth::OAuth::Provider do
end end
context 'when configuration does not specify a custom label' do context 'when configuration does not specify a custom label' do
let(:provider) { OpenStruct.new({ 'name' => name } ) } let(:provider) { ActiveSupport::InheritableOptions.new(name: name) }
before do before do
stub_omniauth_setting(providers: [provider]) stub_omniauth_setting(providers: [provider])
......
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