rr 0.4.2 → 0.4.3

data/spec/rr/expectations/times_called_expectation/times_called_expectation_any_times_spec.rb

@@ -8,7 +8,7 @@ module RR
 
       before do
         @at_least = TimesCalledMatchers::AnyTimesMatcher.new
-        @expectation = TimesCalledExpectation.new(scenario, at_least)
+        @expectation = TimesCalledExpectation.new(double, at_least)
       end
       
       describe "#verify!" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_at_least_spec.rb

@@ -9,7 +9,7 @@ module Expectations
     before do
       @times = 3
       @at_least = TimesCalledMatchers::AtLeastMatcher.new(times)
-      @expectation = TimesCalledExpectation.new(scenario, at_least)
+      @expectation = TimesCalledExpectation.new(double, at_least)
     end
     
     describe "#verify!" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_at_most_spec.rb

@@ -9,7 +9,7 @@ module RR
       before do
         @times = 3
         @at_most = TimesCalledMatchers::AtMostMatcher.new(times)
-        @expectation = TimesCalledExpectation.new(scenario, at_most)
+        @expectation = TimesCalledExpectation.new(double, at_most)
       end
 
       describe "#verify!" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_helper.rb

@@ -3,14 +3,14 @@ require "spec/spec_helper"
 module RR
   module Expectations
     describe TimesCalledExpectation, :shared => true do
-      attr_reader :space, :object, :method_name, :double_insertion, :scenario, :expectation
+      attr_reader :space, :object, :method_name, :double_insertion, :double, :expectation
       before do
         @space = Space.new
         @object = Object.new
         @method_name = :foobar
         @double_insertion = space.double_insertion(object, method_name)
-        @scenario = space.scenario(double_insertion)
-        scenario.with_any_args
+        @double = space.double(double_insertion)
+        double.with_any_args
       end
 
       def raises_expectation_error(&block)

data/spec/rr/expectations/times_called_expectation/times_called_expectation_integer_spec.rb

@@ -8,7 +8,7 @@ module RR
 
       before do
         @matcher = TimesCalledMatchers::IntegerMatcher.new(2)
-        @expectation = TimesCalledExpectation.new(scenario, matcher)
+        @expectation = TimesCalledExpectation.new(double, matcher)
         @expected_line = __LINE__ - 1
       end
       

data/spec/rr/expectations/times_called_expectation/times_called_expectation_proc_spec.rb

@@ -8,7 +8,7 @@ module RR
 
       before do
         @matcher = TimesCalledMatchers::ProcMatcher.new(proc {|value| value == 2})
-        @expectation = TimesCalledExpectation.new(scenario, matcher)
+        @expectation = TimesCalledExpectation.new(double, matcher)
       end
       
       describe "#verify" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_range_spec.rb

@@ -8,7 +8,7 @@ module RR
 
       before do
         @matcher = TimesCalledMatchers::RangeMatcher.new(1..2)
-        @expectation = TimesCalledExpectation.new(scenario, matcher)
+        @expectation = TimesCalledExpectation.new(double, matcher)
       end
 
       describe "#verify" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_spec.rb

@@ -9,16 +9,16 @@ module RR
       before do
         @times = 0
         @matcher = TimesCalledMatchers::IntegerMatcher.new(times)
-        @expectation = TimesCalledExpectation.new(scenario, matcher)
+        @expectation = TimesCalledExpectation.new(double, matcher)
       end
       
       describe "#attempt!" do
-        it "raises error that includes the scenario" do
+        it "raises error that includes the double" do
           proc do
             expectation.attempt!
           end.should raise_error(
           Errors::TimesCalledError,
-          "#{scenario.formatted_name}\n#{matcher.error_message(1)}"
+          "#{double.formatted_name}\n#{matcher.error_message(1)}"
           )
         end
       end
@@ -30,7 +30,7 @@ module RR
             expectation.verify!
           end.should raise_error(
           Errors::TimesCalledError,
-          "#{scenario.formatted_name}\n#{matcher.error_message(1)}"
+          "#{double.formatted_name}\n#{matcher.error_message(1)}"
           )
         end
       end

data/spec/rr/rspec/rspec_adapter_spec.rb

@@ -32,9 +32,9 @@ module RR
 
         it "verifies the double_insertions" do
           double_insertion = RR::Space.double_insertion(@subject, @method_name)
-          scenario = RR::Space.scenario(double_insertion)
+          double = RR::Space.double(double_insertion)
 
-          scenario.once
+          double.once
 
           proc do
             @fixture.verify_mocks_for_rspec

data/spec/rr/space/space_create_spec.rb

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe Space, "#scenario_method_proxy", :shared => true do
+  describe Space, "#double_method_proxy", :shared => true do
     it_should_behave_like "RR::Space"
 
     before do
@@ -10,12 +10,12 @@ module RR
     end
 
     it "creates a DoubleMethodProxy" do
-      proxy = @space.scenario_method_proxy(@creator, @object)
+      proxy = @space.double_method_proxy(@creator, @object)
       proxy.should be_instance_of(DoubleMethodProxy)
     end
 
     it "sets space to self" do
-      proxy = @space.scenario_method_proxy(@creator, @object)
+      proxy = @space.double_method_proxy(@creator, @object)
       class << proxy
         attr_reader :space
       end
@@ -23,7 +23,7 @@ module RR
     end
 
     it "sets creator to passed in creator" do
-      proxy = @space.scenario_method_proxy(@creator, @object)
+      proxy = @space.double_method_proxy(@creator, @object)
       class << proxy
         attr_reader :creator
       end
@@ -32,27 +32,27 @@ module RR
 
     it "raises error if passed a method name and a block" do
       proc do
-        @space.scenario_method_proxy(@creator, @object, :foobar) {}
+        @space.double_method_proxy(@creator, @object, :foobar) {}
       end.should raise_error(ArgumentError, "Cannot pass in a method name and a block")
     end
   end
 
-  describe Space, "#scenario_method_proxy with a Mock strategy" do
-    it_should_behave_like "RR::Space#scenario_method_proxy"
+  describe Space, "#double_method_proxy with a Mock strategy" do
+    it_should_behave_like "RR::Space#double_method_proxy"
 
     before do
-      @creator = @space.scenario_creator
+      @creator = @space.double_creator
       @creator.mock
     end
 
     it "creates a mock Double for method when passed a second argument" do
-      @space.scenario_method_proxy(@creator, @object, :foobar).with(1) {:baz}
+      @space.double_method_proxy(@creator, @object, :foobar).with(1) {:baz}
       @object.foobar(1).should == :baz
       proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
     end
 
     it "uses block definition when passed a block" do
-      @space.scenario_method_proxy(@creator, @object) do |c|
+      @space.double_method_proxy(@creator, @object) do |c|
         c.foobar(1) {:baz}
       end
       @object.foobar(1).should == :baz
@@ -60,22 +60,22 @@ module RR
     end
   end
 
-  describe Space, "#scenario_method_proxy with a Stub strategy" do
-    it_should_behave_like "RR::Space#scenario_method_proxy"
+  describe Space, "#double_method_proxy with a Stub strategy" do
+    it_should_behave_like "RR::Space#double_method_proxy"
 
     before do
-      @creator = @space.scenario_creator
+      @creator = @space.double_creator
       @creator.stub
     end
 
     it "creates a stub Double for method when passed a second argument" do
-      @space.scenario_method_proxy(@creator, @object, :foobar).with(1) {:baz}
+      @space.double_method_proxy(@creator, @object, :foobar).with(1) {:baz}
       @object.foobar(1).should == :baz
       @object.foobar(1).should == :baz
     end
 
     it "uses block definition when passed a block" do
-      @space.scenario_method_proxy(@creator, @object) do |c|
+      @space.double_method_proxy(@creator, @object) do |c|
         c.foobar(1) {:return_value}
         c.foobar.with_any_args {:default}
         c.baz(1) {:baz_value}
@@ -86,11 +86,11 @@ module RR
     end
   end
 
-  describe Space, "#scenario_method_proxy with a Mock Proxy strategy" do
-    it_should_behave_like "RR::Space#scenario_method_proxy"
+  describe Space, "#double_method_proxy with a Mock Proxy strategy" do
+    it_should_behave_like "RR::Space#double_method_proxy"
 
     before do
-      @creator = @space.scenario_creator
+      @creator = @space.double_creator
       @creator.mock.proxy
       def @object.foobar(*args)
         :original_foobar
@@ -98,13 +98,13 @@ module RR
     end
 
     it "creates a mock proxy Double for method when passed a second argument" do
-      @space.scenario_method_proxy(@creator, @object, :foobar).with(1)
+      @space.double_method_proxy(@creator, @object, :foobar).with(1)
       @object.foobar(1).should == :original_foobar
       proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
     end
 
     it "uses block definition when passed a block" do
-      @space.scenario_method_proxy(@creator, @object) do |c|
+      @space.double_method_proxy(@creator, @object) do |c|
         c.foobar(1)
       end
       @object.foobar(1).should == :original_foobar
@@ -112,11 +112,11 @@ module RR
     end
   end
 
-  describe Space, "#scenario_method_proxy with a Stub proxy strategy" do
-    it_should_behave_like "RR::Space#scenario_method_proxy"
+  describe Space, "#double_method_proxy with a Stub proxy strategy" do
+    it_should_behave_like "RR::Space#double_method_proxy"
 
     before do
-      @creator = @space.scenario_creator
+      @creator = @space.double_creator
       @creator.stub.proxy
       def @object.foobar(*args)
         :original_foobar
@@ -124,13 +124,13 @@ module RR
     end
 
     it "creates a stub proxy Double for method when passed a second argument" do
-      @space.scenario_method_proxy(@creator, @object, :foobar)
+      @space.double_method_proxy(@creator, @object, :foobar)
       @object.foobar(1).should == :original_foobar
       @object.foobar(1).should == :original_foobar
     end
 
     it "uses block definition when passed a block" do
-      @space.scenario_method_proxy(@creator, @object) do |c|
+      @space.double_method_proxy(@creator, @object) do |c|
         c.foobar(1)
       end
       @object.foobar(1).should == :original_foobar
@@ -138,34 +138,34 @@ module RR
     end
   end
 
-  describe Space, "#scenario_method_proxy with a Do Not Allow strategy" do
-    it_should_behave_like "RR::Space#scenario_method_proxy"
+  describe Space, "#double_method_proxy with a Do Not Allow strategy" do
+    it_should_behave_like "RR::Space#double_method_proxy"
 
     before do
-      @creator = @space.scenario_creator
+      @creator = @space.double_creator
       @creator.dont_allow
     end
 
     it "creates a do not allow Double for method when passed a second argument" do
-      @space.scenario_method_proxy(@creator, @object, :foobar).with(1)
+      @space.double_method_proxy(@creator, @object, :foobar).with(1)
       proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
     end
 
     it "uses block definition when passed a block" do
-      @space.scenario_method_proxy(@creator, @object) do |c|
+      @space.double_method_proxy(@creator, @object) do |c|
         c.foobar(1)
       end
       proc {@object.foobar(1)}.should raise_error(Errors::TimesCalledError)
     end
   end
 
-  describe Space, "#scenario_creator" do
+  describe Space, "#double_creator" do
     it_should_behave_like "RR::Space"
 
     before do
       @space = Space.new
       @object = Object.new
-      @creator = @space.scenario_creator
+      @creator = @space.double_creator
     end
 
     it "sets the space" do
@@ -177,7 +177,7 @@ module RR
     end
   end
 
-  describe Space, "#scenario" do
+  describe Space, "#double" do
     it_should_behave_like "RR::Space"
 
     before do
@@ -188,12 +188,12 @@ module RR
 
     it "creates a Double and registers it to the double_insertion" do
       double_insertion = @space.double_insertion(@object, @method_name)
-      def double_insertion.scenarios
-        @scenarios
+      def double_insertion.doubles
+        @doubles
       end
 
-      scenario = @space.scenario(double_insertion)
-      double_insertion.scenarios.should include(scenario)
+      double = @space.double(double_insertion)
+      double_insertion.doubles.should include(double)
     end
   end
 

data/spec/rr/space/space_register_spec.rb

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe Space, "#register_ordered_scenario" do
+  describe Space, "#register_ordered_double" do
     it_should_behave_like "RR::Space"
 
     before(:each) do
@@ -17,16 +17,16 @@ module RR
       Space.instance = @original_space
     end
 
-    it "adds the ordered scenario to the ordered_scenarios collection" do
-      scenario1 = @space.scenario(@double_insertion)
+    it "adds the ordered double to the ordered_doubles collection" do
+      double1 = @space.double(@double_insertion)
 
-      @space.ordered_scenarios.should == []
-      @space.register_ordered_scenario scenario1
-      @space.ordered_scenarios.should == [scenario1]
+      @space.ordered_doubles.should == []
+      @space.register_ordered_double double1
+      @space.ordered_doubles.should == [double1]
 
-      scenario2 = @space.scenario(@double_insertion)
-      @space.register_ordered_scenario scenario2
-      @space.ordered_scenarios.should == [scenario1, scenario2]
+      double2 = @space.double(@double_insertion)
+      @space.register_ordered_double double2
+      @space.ordered_doubles.should == [double1, double2]
     end
   end
 end

data/spec/rr/space/space_reset_spec.rb

@@ -11,20 +11,20 @@ module RR
         @method_name = :foobar
       end
 
-      it "removes the ordered scenarios" do
+      it "removes the ordered doubles" do
         double1 = @space.double_insertion(@object1, :foobar1)
         double2 = @space.double_insertion(@object1, :foobar2)
 
-        scenario1 = @space.scenario(double1)
-        scenario2 = @space.scenario(double2)
+        double1 = @space.double(double1)
+        double2 = @space.double(double2)
 
-        scenario1.ordered
-        scenario2.ordered
+        double1.ordered
+        double2.ordered
 
-        @space.ordered_scenarios.should_not be_empty
+        @space.ordered_doubles.should_not be_empty
 
         @space.reset
-        @space.ordered_scenarios.should be_empty
+        @space.ordered_doubles.should be_empty
       end
 
       it "resets all double_insertions" do

data/spec/rr/space/space_verify_spec.rb

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe Space, "#verify_ordered_scenario", :shared => true do
+  describe Space, "#verify_ordered_double", :shared => true do
     before do
       @space = Space.new
       @object = Object.new
@@ -10,14 +10,14 @@ module RR
     end
 
     it "raises an error when Double is NonTerminal" do
-      scenario = @space.scenario(@double_insertion)
-      @space.register_ordered_scenario(scenario)
+      double = @space.double(@double_insertion)
+      @space.register_ordered_double(double)
 
-      scenario.any_number_of_times
-      scenario.should_not be_terminal
+      double.any_number_of_times
+      double.should_not be_terminal
 
       proc do
-        @space.verify_ordered_scenario(scenario)
+        @space.verify_ordered_double(double)
       end.should raise_error(
       Errors::DoubleOrderError,
       "Ordered Doubles cannot have a NonTerminal TimesCalledExpectation"
@@ -127,42 +127,42 @@ module RR
       end
     end
 
-    describe "#verify_ordered_scenario where the passed in scenario is at the front of the queue" do
-      it_should_behave_like "RR::Space#verify_ordered_scenario"
+    describe "#verify_ordered_double where the passed in double is at the front of the queue" do
+      it_should_behave_like "RR::Space#verify_ordered_double"
 
-      it "keeps the scenario when times called is not verified" do
-        scenario = @space.scenario(@double_insertion)
-        @space.register_ordered_scenario(scenario)
+      it "keeps the double when times called is not verified" do
+        double = @space.double(@double_insertion)
+        @space.register_ordered_double(double)
 
-        scenario.twice
-        scenario.should be_attempt
+        double.twice
+        double.should be_attempt
 
-        @space.verify_ordered_scenario(scenario)
-        @space.ordered_scenarios.should include(scenario)
+        @space.verify_ordered_double(double)
+        @space.ordered_doubles.should include(double)
       end
 
-      it "removes the scenario when times called expectation should no longer be attempted" do
-        scenario = @space.scenario(@double_insertion)
-        @space.register_ordered_scenario(scenario)
+      it "removes the double when times called expectation should no longer be attempted" do
+        double = @space.double(@double_insertion)
+        @space.register_ordered_double(double)
 
-        scenario.with(1).once
+        double.with(1).once
         @object.foobar(1)
-        scenario.should_not be_attempt
+        double.should_not be_attempt
 
-        @space.verify_ordered_scenario(scenario)
-        @space.ordered_scenarios.should_not include(scenario)
+        @space.verify_ordered_double(double)
+        @space.ordered_doubles.should_not include(double)
       end
     end
 
-    describe "#verify_ordered_scenario where the passed in scenario is not at the front of the queue" do
-      it_should_behave_like "RR::Space#verify_ordered_scenario"
+    describe "#verify_ordered_double where the passed in double is not at the front of the queue" do
+      it_should_behave_like "RR::Space#verify_ordered_double"
 
       it "raises error" do
-        first_scenario = scenario
-        second_scenario = scenario
+        first_double = double
+        second_double = double
 
         proc do
-          @space.verify_ordered_scenario(second_scenario)
+          @space.verify_ordered_double(second_double)
         end.should raise_error(
         Errors::DoubleOrderError,
         "foobar() called out of order in list\n" <<
@@ -171,10 +171,10 @@ module RR
         )
       end
 
-      def scenario
-        scenario_definition = @space.scenario(@double_insertion).once
-        @space.register_ordered_scenario(scenario_definition.scenario)
-        scenario_definition.scenario
+      def double
+        double_definition = @space.double(@double_insertion).once
+        @space.register_ordered_double(double_definition.double)
+        double_definition.double
       end
     end
   end