Commit f266ec21 authored by Rajendra Kadam's avatar Rajendra Kadam Committed by Peter Leitzen

Fix leaky constant in admin mode migration spec

parent 9ed1e151
...@@ -355,7 +355,6 @@ RSpec/LeakyConstantDeclaration: ...@@ -355,7 +355,6 @@ RSpec/LeakyConstantDeclaration:
- 'spec/lib/gitlab/quick_actions/dsl_spec.rb' - 'spec/lib/gitlab/quick_actions/dsl_spec.rb'
- 'spec/lib/marginalia_spec.rb' - 'spec/lib/marginalia_spec.rb'
- 'spec/mailers/notify_spec.rb' - 'spec/mailers/notify_spec.rb'
- 'spec/migrations/20191125114345_add_admin_mode_protected_path_spec.rb'
- 'spec/models/concerns/batch_destroy_dependent_associations_spec.rb' - 'spec/models/concerns/batch_destroy_dependent_associations_spec.rb'
- 'spec/models/concerns/bulk_insert_safe_spec.rb' - 'spec/models/concerns/bulk_insert_safe_spec.rb'
- 'spec/models/concerns/bulk_insertable_associations_spec.rb' - 'spec/models/concerns/bulk_insertable_associations_spec.rb'
......
---
title: Fix leaky constant issue in admin mode migration spec
merge_request: 32074
author: Rajendra Kadam
type: fixed
...@@ -4,10 +4,9 @@ require 'spec_helper' ...@@ -4,10 +4,9 @@ require 'spec_helper'
require Rails.root.join('db', 'migrate', '20191125114345_add_admin_mode_protected_path.rb') require Rails.root.join('db', 'migrate', '20191125114345_add_admin_mode_protected_path.rb')
describe AddAdminModeProtectedPath do describe AddAdminModeProtectedPath do
ADMIN_MODE_ENDPOINT = '/admin/session'
subject(:migration) { described_class.new } subject(:migration) { described_class.new }
let(:admin_mode_endpoint) { '/admin/session' }
let(:application_settings) { table(:application_settings) } let(:application_settings) { table(:application_settings) }
context 'no settings available' do context 'no settings available' do
...@@ -30,7 +29,7 @@ describe AddAdminModeProtectedPath do ...@@ -30,7 +29,7 @@ describe AddAdminModeProtectedPath do
application_settings.create!(protected_paths: '{a,b,c}') application_settings.create!(protected_paths: '{a,b,c}')
protected_paths_before = %w[a b c] protected_paths_before = %w[a b c]
protected_paths_after = protected_paths_before.dup << ADMIN_MODE_ENDPOINT protected_paths_after = protected_paths_before.dup << admin_mode_endpoint
expect { migrate! }.to change { application_settings.first.protected_paths }.from(protected_paths_before).to(protected_paths_after) expect { migrate! }.to change { application_settings.first.protected_paths }.from(protected_paths_before).to(protected_paths_after)
end end
...@@ -38,13 +37,13 @@ describe AddAdminModeProtectedPath do ...@@ -38,13 +37,13 @@ describe AddAdminModeProtectedPath do
it 'new default includes admin mode endpoint' do it 'new default includes admin mode endpoint' do
settings_before = application_settings.create! settings_before = application_settings.create!
expect(settings_before.protected_paths).not_to include(ADMIN_MODE_ENDPOINT) expect(settings_before.protected_paths).not_to include(admin_mode_endpoint)
migrate! migrate!
application_settings.reset_column_information application_settings.reset_column_information
settings_after = application_settings.create! settings_after = application_settings.create!
expect(settings_after.protected_paths).to include(ADMIN_MODE_ENDPOINT) expect(settings_after.protected_paths).to include(admin_mode_endpoint)
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