Skip to content

Commit

Permalink
Consistently use correct Minitest constant
Browse files Browse the repository at this point in the history
  • Loading branch information
vanstee authored and alindeman committed Aug 10, 2013
1 parent a5a04b6 commit 31ba3e5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions lib/rspec/rails/adapters.rb
Expand Up @@ -48,8 +48,8 @@ def #{method}(*args, &block)
end
end

# MiniTest::Unit::LifecycleHooks
module MiniTestLifecycleAdapter
# Minitest::Test::LifecycleHooks
module MinitestLifecycleAdapter
extend ActiveSupport::Concern

included do |group|
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/rails/example/rails_example_group.rb
Expand Up @@ -7,7 +7,7 @@ module Rails
module RailsExampleGroup
extend ActiveSupport::Concern
include RSpec::Rails::SetupAndTeardownAdapter
include RSpec::Rails::MiniTestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
include RSpec::Rails::MinitestLifecycleAdapter if ::Rails::VERSION::STRING >= '4'
include RSpec::Rails::TestUnitAssertionAdapter
include RSpec::Rails::Matchers
end
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/rails/fixture_support.rb
Expand Up @@ -4,7 +4,7 @@ module Rails
module FixtureSupport
extend ActiveSupport::Concern
include RSpec::Rails::SetupAndTeardownAdapter
include RSpec::Rails::MiniTestLifecycleAdapter if ::ActiveRecord::VERSION::STRING > '4'
include RSpec::Rails::MinitestLifecycleAdapter if ::ActiveRecord::VERSION::STRING > '4'
include RSpec::Rails::TestUnitAssertionAdapter
include ActiveRecord::TestFixtures

Expand Down
4 changes: 2 additions & 2 deletions spec/rspec/rails/assertion_adapter_spec.rb
Expand Up @@ -18,11 +18,11 @@
end
end

it "does not expose internal methods of MiniTest" do
it "does not expose internal methods of Minitest" do
methods.should_not include("_assertions")
end

it "does not expose MiniTest's message method" do
it "does not expose Minitest's message method" do
methods.should_not include("message")
end
end
6 changes: 3 additions & 3 deletions spec/rspec/rails/minitest_lifecycle_adapter_spec.rb
@@ -1,10 +1,10 @@
require "spec_helper"

describe RSpec::Rails::MiniTestLifecycleAdapter do
describe RSpec::Rails::MinitestLifecycleAdapter do
it "invokes minitest lifecycle hooks at the appropriate times" do
invocations = []
example_group = RSpec::Core::ExampleGroup.describe("MiniTestHooks") do
include RSpec::Rails::MiniTestLifecycleAdapter
example_group = RSpec::Core::ExampleGroup.describe("MinitestHooks") do
include RSpec::Rails::MinitestLifecycleAdapter

define_method(:before_setup) { invocations << :before_setup }
define_method(:after_setup) { invocations << :after_setup }
Expand Down

0 comments on commit 31ba3e5

Please sign in to comment.