Switch to --require spec_helper option.

rspec · Feb 23, 2014 · 55a2171 · 55a2171
1 parent 0bce361
commit 55a2171
Show file tree

Hide file tree

Showing 55 changed files with 1 addition and 106 deletions.
diff --git a/.rspec b/.rspec
@@ -1 +1,2 @@
 --warnings
+--require spec_helper
diff --git a/spec/rspec/mocks/and_call_original_spec.rb b/spec/rspec/mocks/and_call_original_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'delegate'
 
 describe "and_call_original" do

diff --git a/spec/rspec/mocks/and_return_spec.rb b/spec/rspec/mocks/and_return_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe 'and_return' do

diff --git a/spec/rspec/mocks/and_yield_spec.rb b/spec/rspec/mocks/and_yield_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe RSpec::Mocks::Double do
 
   let(:obj) { double }

diff --git a/spec/rspec/mocks/any_instance/message_chains_spec.rb b/spec/rspec/mocks/any_instance/message_chains_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe RSpec::Mocks::AnyInstance::MessageChains do
   let(:recorder) { double }
   let(:chains) { RSpec::Mocks::AnyInstance::MessageChains.new }

diff --git a/spec/rspec/mocks/any_instance_spec.rb b/spec/rspec/mocks/any_instance_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'delegate'
 
 module RSpec

diff --git a/spec/rspec/mocks/array_including_matcher_spec.rb b/spec/rspec/mocks/array_including_matcher_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     module ArgumentMatchers

diff --git a/spec/rspec/mocks/at_least_spec.rb b/spec/rspec/mocks/at_least_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "at_least" do

diff --git a/spec/rspec/mocks/at_most_spec.rb b/spec/rspec/mocks/at_most_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "at_most" do

diff --git a/spec/rspec/mocks/before_all_spec.rb b/spec/rspec/mocks/before_all_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe "Using rspec-mocks features in before(:all) blocks" do
   shared_examples_for "fails in a before(:all) block" do
     the_error = nil

diff --git a/spec/rspec/mocks/block_return_value_spec.rb b/spec/rspec/mocks/block_return_value_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe "a double declaration with a block handed to:" do
   describe "should_receive" do
     it "returns the value of executing the block" do

diff --git a/spec/rspec/mocks/combining_implementation_instructions_spec.rb b/spec/rspec/mocks/combining_implementation_instructions_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "Combining implementation instructions" do

diff --git a/spec/rspec/mocks/configuration_spec.rb b/spec/rspec/mocks/configuration_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe Configuration do

diff --git a/spec/rspec/mocks/double_spec.rb b/spec/rspec/mocks/double_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe Double do

diff --git a/spec/rspec/mocks/example_methods_spec.rb b/spec/rspec/mocks/example_methods_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe ExampleMethods do

diff --git a/spec/rspec/mocks/extensions/marshal_spec.rb b/spec/rspec/mocks/extensions/marshal_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Marshal, 'extensions' do
   # An object that raises when code attempts to dup it.
   #

diff --git a/spec/rspec/mocks/failing_argument_matchers_spec.rb b/spec/rspec/mocks/failing_argument_matchers_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "failing MockArgumentMatchers" do

diff --git a/spec/rspec/mocks/hash_excluding_matcher_spec.rb b/spec/rspec/mocks/hash_excluding_matcher_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     module ArgumentMatchers

diff --git a/spec/rspec/mocks/hash_including_matcher_spec.rb b/spec/rspec/mocks/hash_including_matcher_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     module ArgumentMatchers

diff --git a/spec/rspec/mocks/instance_method_stasher_spec.rb b/spec/rspec/mocks/instance_method_stasher_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe InstanceMethodStasher do

diff --git a/spec/rspec/mocks/matchers/have_received_spec.rb b/spec/rspec/mocks/matchers/have_received_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe Matchers::HaveReceived do

diff --git a/spec/rspec/mocks/matchers/receive_message_chain_spec.rb b/spec/rspec/mocks/matchers/receive_message_chain_spec.rb
@@ -1,6 +1,3 @@
-require "spec_helper"
-
-
 module RSpec::Mocks::Matchers
   describe "receive_message_chain" do
     let(:object) { double(:object) }

diff --git a/spec/rspec/mocks/matchers/receive_messages_spec.rb b/spec/rspec/mocks/matchers/receive_messages_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     shared_examples_for "complains when given blocks" do

diff --git a/spec/rspec/mocks/matchers/receive_spec.rb b/spec/rspec/mocks/matchers/receive_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe Matchers::Receive do

diff --git a/spec/rspec/mocks/method_signature_verifier_spec.rb b/spec/rspec/mocks/method_signature_verifier_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe MethodSignatureVerifier do

diff --git a/spec/rspec/mocks/methods_spec.rb b/spec/rspec/mocks/methods_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "Methods added to every object" do

diff --git a/spec/rspec/mocks/mock_expectation_error_spec.rb b/spec/rspec/mocks/mock_expectation_error_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe 'MockExpectationError' do

diff --git a/spec/rspec/mocks/mock_ordering_spec.rb b/spec/rspec/mocks/mock_ordering_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
 

diff --git a/spec/rspec/mocks/multiple_return_value_spec.rb b/spec/rspec/mocks/multiple_return_value_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "a double stubbed with multiple return values" do

diff --git a/spec/rspec/mocks/mutate_const_spec.rb b/spec/rspec/mocks/mutate_const_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 TOP_LEVEL_VALUE_CONST = 7
 
 class TestClass

diff --git a/spec/rspec/mocks/nil_expectation_warning_spec.rb b/spec/rspec/mocks/nil_expectation_warning_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "an expectation set on nil" do

diff --git a/spec/rspec/mocks/null_object_double_spec.rb b/spec/rspec/mocks/null_object_double_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "a double _not_ acting as a null object" do

diff --git a/spec/rspec/mocks/once_counts_spec.rb b/spec/rspec/mocks/once_counts_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "#once" do

diff --git a/spec/rspec/mocks/options_hash_spec.rb b/spec/rspec/mocks/options_hash_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "calling :should_receive with an options hash" do

diff --git a/spec/rspec/mocks/order_group_spec.rb b/spec/rspec/mocks/order_group_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 describe 'OrderGroup' do
   let(:order_group) { ::RSpec::Mocks::OrderGroup.new }
 

diff --git a/spec/rspec/mocks/partial_double_spec.rb b/spec/rspec/mocks/partial_double_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "A partial double" do

diff --git a/spec/rspec/mocks/partial_double_using_mocks_directly_spec.rb b/spec/rspec/mocks/partial_double_using_mocks_directly_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec::Mocks
   describe "PartialDoubleUsingMocksDirectly" do
     let(:klass) do

diff --git a/spec/rspec/mocks/passing_argument_matchers_spec.rb b/spec/rspec/mocks/passing_argument_matchers_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "Passing argument matchers" do

diff --git a/spec/rspec/mocks/precise_counts_spec.rb b/spec/rspec/mocks/precise_counts_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "PreciseCounts" do

diff --git a/spec/rspec/mocks/record_messages_spec.rb b/spec/rspec/mocks/record_messages_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "a mock" do

diff --git a/spec/rspec/mocks/serialization_spec.rb b/spec/rspec/mocks/serialization_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "Serialization of mocked objects" do

diff --git a/spec/rspec/mocks/space_spec.rb b/spec/rspec/mocks/space_spec.rb
@@ -1,4 +1,3 @@
-require 'spec_helper'
 
 module RSpec::Mocks
   describe Space do

diff --git a/spec/rspec/mocks/stash_spec.rb b/spec/rspec/mocks/stash_spec.rb
@@ -1,8 +1,5 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
-
     describe "only stashing the original method" do
       let(:klass) do
         Class.new do

diff --git a/spec/rspec/mocks/stub_chain_spec.rb b/spec/rspec/mocks/stub_chain_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "A chained method stub" do

diff --git a/spec/rspec/mocks/stub_implementation_spec.rb b/spec/rspec/mocks/stub_implementation_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "stub implementation" do

diff --git a/spec/rspec/mocks/stub_spec.rb b/spec/rspec/mocks/stub_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "A method stub" do

diff --git a/spec/rspec/mocks/stubbed_message_expectations_spec.rb b/spec/rspec/mocks/stubbed_message_expectations_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "expection set on previously stubbed method" do
   it "fails if message is not received after expectation is set" do
     double = double(:msg => nil)

diff --git a/spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb b/spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 module RSpec
   module Mocks
 

diff --git a/spec/rspec/mocks/syntax_spec.rb b/spec/rspec/mocks/syntax_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 module RSpec::Mocks
   describe Syntax do
     context "when the should syntax is enabled on a non-default syntax host" do

diff --git a/spec/rspec/mocks/test_double_spec.rb b/spec/rspec/mocks/test_double_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe TestDouble do

diff --git a/spec/rspec/mocks/to_ary_spec.rb b/spec/rspec/mocks/to_ary_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe "a double receiving to_ary" do
   shared_examples "to_ary" do
     it "can be overridden with a stub" do

diff --git a/spec/rspec/mocks/twice_counts_spec.rb b/spec/rspec/mocks/twice_counts_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe "#twice" do

diff --git a/spec/rspec/mocks/verifying_double_spec.rb b/spec/rspec/mocks/verifying_double_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class LoadedClass
   extend RSpec::Mocks::RubyFeatures
 

diff --git a/spec/rspec/mocks/verifying_message_expecation_spec.rb b/spec/rspec/mocks/verifying_message_expecation_spec.rb
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 module RSpec
   module Mocks
     describe VerifyingMessageExpectation do

diff --git a/spec/rspec/mocks_spec.rb b/spec/rspec/mocks_spec.rb
@@ -1,5 +1,3 @@
-require "spec_helper"
-
 describe RSpec::Mocks do
   describe ".verify" do
     it "delegates to the space" do