Skip to content

split spec bootstapping into separate files #1719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions spec/generator_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require 'rails_helper'
require 'ammeter/init'
require 'support/generators'
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/controller/controller_generator'
require 'support/generators'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the excess whitespace introduced here and in similar places

RSpec.describe Rspec::Generators::ControllerGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/feature/feature_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by rails
require 'generators/rspec/feature/feature_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::FeatureGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/helper/helper_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/helper/helper_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::HelperGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/install/install_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/install/install_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::InstallGenerator, :type => :generator do
def use_active_record_migration
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/integration/integration_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::IntegrationGenerator, :type => :generator do
setup_default_destination
Expand Down
3 changes: 1 addition & 2 deletions spec/generators/rspec/job/job_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/job/job_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::JobGenerator, :type => :generator, :skip => !RSpec::Rails::FeatureCheck.has_active_job? do
setup_default_destination
Expand All @@ -13,6 +13,5 @@
it { is_expected.to exist }
it { is_expected.to contain(/require 'rails_helper'/) }
it { is_expected.to contain(/describe UserJob, #{type_metatag(:job)}/) }

end
end
2 changes: 1 addition & 1 deletion spec/generators/rspec/mailer/mailer_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/mailer/mailer_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::MailerGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/model/model_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/model/model_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::ModelGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/observer/observer_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/observer/observer_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::ObserverGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/request/request_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/request/request_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::RequestGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/scaffold/scaffold_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/scaffold/scaffold_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::ScaffoldGenerator, :type => :generator do
setup_default_destination
Expand Down
2 changes: 1 addition & 1 deletion spec/generators/rspec/view/view_generator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'generator_helper'
# Generators are not automatically loaded by Rails
require 'generators/rspec/view/view_generator'
require 'support/generators'

RSpec.describe Rspec::Generators::ViewGenerator, :type => :generator do
setup_default_destination
Expand Down
13 changes: 13 additions & 0 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
require 'rails/all'

module RSpecRails
class Application < ::Rails::Application
self.config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base
end
end
I18n.enforce_available_locales = true if I18n.respond_to?(:enforce_available_locales)

require 'rspec/support/spec'
require 'rspec/rails'

Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
1 change: 1 addition & 0 deletions spec/rspec/rails/active_model_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'rails_helper'
RSpec.describe "ActiveModel support" do
around do |ex|
old_value = RSpec::Mocks.configuration.verify_partial_doubles?
Expand Down
1 change: 1 addition & 0 deletions spec/rspec/rails/active_record_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'rails_helper'
RSpec.describe "ActiveRecord support" do
around do |ex|
old_value = RSpec::Mocks.configuration.verify_partial_doubles?
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/assertion_adapter_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

describe RSpec::Rails::MinitestAssertionAdapter do
include RSpec::Rails::MinitestAssertionAdapter
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/assertion_delegator_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

describe RSpec::Rails::AssertionDelegator do
it "provides a module that delegates assertion methods to an isolated class" do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/configuration_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
require 'rspec/support/spec/in_sub_process'

RSpec.describe "Configuration" do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/example/controller_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

class ::ApplicationController
def self.abstract?; false; end
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/example/feature_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

module RSpec::Rails
describe FeatureExampleGroup do
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/example/helper_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

module RSpec::Rails
describe HelperExampleGroup do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/example/job_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

module RSpec::Rails
describe JobExampleGroup do
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/example/mailer_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

module RSpec::Rails
describe MailerExampleGroup do
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/example/model_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

module RSpec::Rails
describe ModelExampleGroup do
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/example/request_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

module RSpec::Rails
describe RequestExampleGroup do
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/example/routing_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

module RSpec::Rails
describe RoutingExampleGroup do
Expand Down
2 changes: 0 additions & 2 deletions spec/rspec/rails/example/view_example_group_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require "spec_helper"

module RSpec::Rails
describe ViewExampleGroup do
it_behaves_like "an rspec-rails example group mixin", :view,
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/fixture_support_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

module RSpec::Rails
describe FixtureSupport do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/active_job_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
require "rspec/rails/feature_check"

if RSpec::Rails::FeatureCheck.has_active_job?
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/matchers/be_a_new_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

describe "be_a_new matcher" do
include RSpec::Rails::Matchers
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/matchers/be_new_record_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

describe "be_new_record" do
include RSpec::Rails::Matchers
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/be_routable_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

describe "be_routable" do
include RSpec::Rails::Matchers::RoutingMatchers
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/be_valid_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
require 'rspec/rails/matchers/be_valid'

describe "be_valid matcher" do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/has_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

class CollectionOwner < ActiveRecord::Base
connection.execute <<-SQL
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/have_http_status_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'spec_helper'
require 'rails_helper'

RSpec.describe "have_http_status" do
include RSpec::Rails::Matchers
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/have_rendered_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

%w[have_rendered render_template].each do |template_expectation|
describe template_expectation do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/redirect_to_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'
require "active_support"
require "active_support/test_case"

Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/relation_match_array_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

describe "ActiveSupport::Relation match_array matcher" do
before { MockableModel.delete_all }
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/matchers/route_to_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

describe "route_to" do
include RSpec::Rails::Matchers::RoutingMatchers
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/minitest_lifecycle_adapter_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require "spec_helper"

describe RSpec::Rails::MinitestLifecycleAdapter do
it "invokes minitest lifecycle hooks at the appropriate times" do
Expand Down
1 change: 0 additions & 1 deletion spec/rspec/rails/setup_and_teardown_adapter_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'spec_helper'

describe RSpec::Rails::SetupAndTeardownAdapter do
describe "::setup" do
Expand Down
2 changes: 1 addition & 1 deletion spec/rspec/rails/view_rendering_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require "spec_helper"
require 'rails_helper'

module RSpec::Rails
describe ViewRendering do
Expand Down
1 change: 1 addition & 0 deletions spec/rspec/rails/view_spec_methods_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'rails_helper'
module RSpec::Rails
RSpec.describe ViewSpecMethods do
before do
Expand Down
1 change: 1 addition & 0 deletions spec/rspec/rails_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'rails_helper'
require 'rspec/support/spec/library_wide_checks'

RSpec.describe "RSpec::Rails" do
Expand Down
1 change: 0 additions & 1 deletion spec/sanity_check_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
require 'spec_helper'
require 'pathname'

RSpec.describe "Verify required rspec dependencies" do
Expand Down
14 changes: 1 addition & 13 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
require 'rails/all'

module RSpecRails
class Application < ::Rails::Application
self.config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base
end
end
I18n.enforce_available_locales = true if I18n.respond_to?(:enforce_available_locales)

# This file should only contain the bare minimum required to configure the spec suite
require 'rspec/support/spec'
require 'rspec/rails'
require 'ammeter/init'

Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

class RSpec::Core::ExampleGroup
def self.run_all(reporter=nil)
Expand Down