diff options
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f53e930f529..02db905b8b1 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -145,12 +145,6 @@ RSpec.configure do |config| metadata[:schema] = :latest if metadata[:level] == :background_migration end - # Do not overwrite type if it's already set - unless metadata.key?(:type) - match = location.match(%r{/spec/([^/]+)/}) - metadata[:type] = match[1].singularize.to_sym if match - end - # Admin controller specs get auto admin mode enabled since they are # protected by the 'EnforcesAdminAuthentication' concern metadata[:enable_admin_mode] = true if %r{(ee)?/spec/controllers/admin/}.match?(location) @@ -214,10 +208,12 @@ RSpec.configure do |config| config.include Capybara::RSpecMatchers, type: :request config.include PendingDirectUploadHelpers, :direct_uploads config.include LabelsHelper, type: :feature + config.include UnlockPipelinesHelpers, :unlock_pipelines config.include_context 'when rendered has no HTML escapes', type: :view include StubFeatureFlags + include StubSaasFeatures include StubSnowplow include StubMember @@ -329,10 +325,6 @@ RSpec.configure do |config| stub_feature_flags(disable_anonymous_project_search: false) stub_feature_flags(disable_cancel_redundant_pipelines_service: false) - # Specs should not get a CAPTCHA challenge by default, this makes the sign-in flow simpler in - # most cases. We do test the CAPTCHA flow in the appropriate specs. - stub_feature_flags(arkose_labs_login_challenge: false) - # Specs should not require email verification by default, this makes the sign-in flow simpler in # most cases. We do test the email verification flow in the appropriate specs. stub_feature_flags(require_email_verification: false) |