typo 5.0.2 → 5.0.3.98

data/vendor/plugins/rspec/spec/spec/runner/options_spec.rb

@@ -18,6 +18,76 @@ module Spec
           @options.examples.should == []
         end
       end
+      
+      describe "#include_pattern" do
+        it "should default to '**/*_spec.rb'" do
+          @options.filename_pattern.should == "**/*_spec.rb"
+        end
+      end
+      
+      describe "#files_to_load" do
+        
+        it "should load files not following pattern if named explicitly" do
+          file = File.expand_path(File.dirname(__FILE__) + "/resources/a_bar.rb")
+          @options.files << file
+          @options.files_to_load.should include(file)
+        end
+        
+        describe "with default --pattern" do
+          it "should load files named _spec.rb" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources/")
+            @options.files << dir
+            @options.files_to_load.should == ["#{dir}/a_spec.rb"]
+          end
+        end
+        
+        describe "with explicit pattern (single)" do
+          before(:each) do
+            @options.filename_pattern = "**/*_foo.rb"
+          end
+        
+          it "should load files following pattern" do
+            file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
+            @options.files << file
+            @options.files_to_load.should include(file)
+          end
+        
+          it "should load files in directories following pattern" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            @options.files << dir
+            @options.files_to_load.should include("#{dir}/a_foo.rb")
+          end
+        
+          it "should not load files in directories not following pattern" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            @options.files << dir
+            @options.files_to_load.should_not include("#{dir}/a_bar.rb")
+          end
+        end
+        
+        describe "with explicit pattern (comma,separated,values)" do
+          
+          before(:each) do
+            @options.filename_pattern = "**/*_foo.rb,**/*_bar.rb"
+          end
+
+          it "should support comma separated values" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            @options.files << dir
+            @options.files_to_load.should include("#{dir}/a_foo.rb")
+            @options.files_to_load.should include("#{dir}/a_bar.rb")
+          end
+        
+          it "should support comma separated values with spaces" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            @options.files << dir
+            @options.files_to_load.should include("#{dir}/a_foo.rb")
+            @options.files_to_load.should include("#{dir}/a_bar.rb")
+          end
+        
+        end
+      
+      end
 
       describe "#backtrace_tweaker" do
         it "should default to QuietBacktraceTweaker" do
@@ -253,7 +323,7 @@ module Spec
           @options.run_examples
         end
 
-        describe "#run_examples when there are example_group" do
+        describe "when there are examples" do
           before(:each) do
             @options.add_example_group Class.new(::Spec::Example::ExampleGroup)
             @options.formatters << Formatter::BaseTextFormatter.new(@options, @out)
@@ -271,7 +341,7 @@ module Spec
           end
         end
 
-        describe "#run_examples when there are no example_group" do
+        describe "when there are no examples" do
           before(:each) do
             @options.formatters << Formatter::BaseTextFormatter.new(@options, @out)
           end

data/vendor/plugins/rspec/spec/spec/runner/resources/a_spec.rb

@@ -0,0 +1 @@
+# Empty - used by ../options_spec.rb

data/vendor/plugins/rspec/spec/spec/runner/spec_parser/spec_parser_fixture.rb

@@ -0,0 +1,70 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+describe "c" do
+
+  it "1" do
+  end
+
+  it "2" do
+  end
+
+end
+
+describe "d" do
+
+  it "3" do
+  end
+
+  it "4" do
+  end
+
+end
+
+class SpecParserSubject
+end
+
+describe SpecParserSubject do
+
+  it "5" do
+  end
+
+end
+
+describe SpecParserSubject, "described" do
+
+  it "6" do
+  end
+
+end
+
+describe SpecParserSubject, "described", :something => :something_else do
+
+   it "7" do
+   end
+
+end
+
+describe "described", :something => :something_else do
+
+  it "8" do
+  end
+
+end
+
+describe "e" do
+
+  it "9" do
+  end
+
+  it "10" do
+  end
+
+  describe "f" do
+    it "11" do
+    end
+
+    it "12" do
+    end
+  end
+
+end

data/vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb

@@ -1,124 +1,79 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-describe "c" do
-
-  it "1" do
-  end
-
-  it "2" do
-  end
-
-end
-
-describe "d" do
-
-  it "3" do
-  end
-
-  it "4" do
-  end
-
-end
-
-class SpecParserSubject
-end
-
-describe SpecParserSubject do
-  
-  it "5" do
-  end
-  
-end
-
-describe SpecParserSubject, "described" do
-  
-  it "6" do
-  end
-  
-end
-
-describe SpecParserSubject, "described", :something => :something_else do
-   
-   it "7" do
-   end
-
-end
-
-describe "described", :something => :something_else do
-  
-  it "8" do
-  end
-  
-end
-   
-
 describe "SpecParser" do
+  attr_reader :parser, :file
   before(:each) do
-    @p = Spec::Runner::SpecParser.new
+    @parser = Spec::Runner::SpecParser.new
+    @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
+    require file
   end
 
   it "should find spec name for 'specify' at same line" do
-    @p.spec_name_for(File.open(__FILE__), 5).should == "c 1"
+    parser.spec_name_for(file, 5).should == "c 1"
   end
 
   it "should find spec name for 'specify' at end of spec line" do
-    @p.spec_name_for(File.open(__FILE__), 6).should == "c 1"
+    parser.spec_name_for(file, 6).should == "c 1"
   end
 
   it "should find context for 'context' above all specs" do
-    @p.spec_name_for(File.open(__FILE__), 4).should == "c"
+    parser.spec_name_for(file, 4).should == "c"
   end
 
   it "should find spec name for 'it' at same line" do
-    @p.spec_name_for(File.open(__FILE__), 15).should == "d 3"
+    parser.spec_name_for(file, 15).should == "d 3"
   end
 
   it "should find spec name for 'it' at end of spec line" do
-    @p.spec_name_for(File.open(__FILE__), 16).should == "d 3"
+    parser.spec_name_for(file, 16).should == "d 3"
   end
 
   it "should find context for 'describe' above all specs" do
-    @p.spec_name_for(File.open(__FILE__), 14).should == "d"
+    parser.spec_name_for(file, 14).should == "d"
   end
 
  it "should find nearest example name between examples" do
-   @p.spec_name_for(File.open(__FILE__), 7).should == "c 1"
+   parser.spec_name_for(file, 7).should == "c 1"
  end
 
   it "should find nothing outside a context" do
-    @p.spec_name_for(File.open(__FILE__), 2).should be_nil
+    parser.spec_name_for(file, 2).should be_nil
   end
-  
+
   it "should find context name for type" do
-    @p.spec_name_for(File.open(__FILE__), 26).should == "SpecParserSubject"
+    parser.spec_name_for(file, 26).should == "SpecParserSubject"
   end
-  
+
   it "should find context and spec name for type" do
-    @p.spec_name_for(File.open(__FILE__), 28).should == "SpecParserSubject 5"
+    parser.spec_name_for(file, 28).should == "SpecParserSubject 5"
   end
 
   it "should find context and description for type" do
-    @p.spec_name_for(File.open(__FILE__), 33).should == "SpecParserSubject described"
+    parser.spec_name_for(file, 33).should == "SpecParserSubject described"
   end
-  
+
   it "should find context and description and example for type" do
-    @p.spec_name_for(File.open(__FILE__), 36).should == "SpecParserSubject described 6"
+    parser.spec_name_for(file, 36).should == "SpecParserSubject described 6"
   end
 
   it "should find context and description for type with modifications" do
-    @p.spec_name_for(File.open(__FILE__), 40).should == "SpecParserSubject described"
+    parser.spec_name_for(file, 40).should == "SpecParserSubject described"
   end
-  
+
   it "should find context and described and example for type with modifications" do
-    @p.spec_name_for(File.open(__FILE__), 43).should == "SpecParserSubject described 7"
+    parser.spec_name_for(file, 43).should == "SpecParserSubject described 7"
   end
-  
+
   it "should find example group" do
-    @p.spec_name_for(File.open(__FILE__), 47).should == "described"
+    parser.spec_name_for(file, 47).should == "described"
   end
-  
+
   it "should find example" do
-    @p.spec_name_for(File.open(__FILE__), 50).should == "described 8"
+    parser.spec_name_for(file, 50).should == "described 8"
+  end
+
+  it "should find nested example" do
+    parser.spec_name_for(file, 63).should == "e f 11"
   end
-  
+
 end

data/vendor/plugins/rspec/spec/spec/spec_classes.rb

@@ -51,6 +51,9 @@ module Spec
           [1]
         end
         
+        def items
+          @items_in_collection_with_size_method
+        end
       end
 
       class HandCodedMock
@@ -119,6 +122,10 @@ module Custom
     def initialize(options)
       @options = options
     end
+
+    def diff_as_object(target, expected)
+      ""
+    end
   end
 end
 

data/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb

@@ -213,6 +213,43 @@ module Spec
           # then
           $scenario.name.should == 'first scenario'
         end
+        
+        it "should clean the steps between stories" do
+          #given
+          story_runner = StoryRunner.new(ScenarioRunner.new)
+          result = mock 'result'
+          
+          step1 = Step.new('step') do
+            result.one
+          end
+          steps1 = StepGroup.new
+          steps1.add :when, step1
+          
+          story_runner.Story 'title', 'narrative', :steps => steps1 do
+            Scenario 'first scenario' do
+              When 'step'
+            end
+          end
+          
+          step2 = Step.new('step') do
+            result.two
+          end
+          steps2 = StepGroup.new
+          steps2.add :when, step2
+          
+          story_runner.Story 'title2', 'narrative', :steps => steps2 do
+            Scenario 'second scenario' do
+              When 'step'
+            end
+          end
+          
+          #then
+          result.should_receive(:one)
+          result.should_receive(:two)
+          
+          #when
+          story_runner.run_stories
+        end
       end
     end
   end

data/vendor/plugins/rspec/spec/spec/story/step_spec.rb

@@ -58,16 +58,50 @@ module Spec
         step.matches?("this anything text").should be_true
       end
       
+      it "should match a regexp with a named variable" do
+        step = Step.new(/this $variable text/) {}
+        step.matches?("this anything text").should be_true
+      end
+      
       it "should not match a non matching regexp" do
         step = Step.new(/this (.*) text/) {}
         step.matches?("other anything text").should be_false
       end
       
+      it "should not match a non matching regexp with a named variable" do
+        step = Step.new(/this $variable text/) {}
+        step.matches?("other anything text").should be_false
+      end
+      
       it "should not get bogged down by parens in strings" do
         step = Step.new("before () after") {}
         step.matches?("before () after").should be_true
       end
       
+      it "should match any option of an alteration" do
+        step = Step.new(/(he|she) is cool/) {}
+        step.matches?("he is cool").should be_true
+        step.matches?("she is cool").should be_true
+      end
+      
+      it "should match alteration as well as a variable" do
+        step = Step.new(/(he|she) is (.*)/) {}
+        step.matches?("he is cool").should be_true
+        step.parse_args("he is cool").should == ['he', 'cool']
+      end
+      
+      it "should match alteration as well as a named variable" do
+        step = Step.new(/(he|she) is $adjective/) {}
+        step.matches?("he is cool").should be_true
+        step.parse_args("he is cool").should == ['he', 'cool']
+      end
+      
+      it "should match alteration as well as a anonymous and named variable" do
+        step = Step.new(/(he|she) is (.*?) $adjective/) {}
+        step.matches?("he is very cool").should be_true
+        step.parse_args("he is very cool").should == ['he', 'very', 'cool']
+      end
+      
     end
     
     describe Step do
@@ -142,6 +176,25 @@ module Spec
         $amount.should == "3"
       end
 
+      it "should perform itself when defined with a regexp with 2 parameters" do
+        # given
+        $pronoun = nil
+        $adjective = nil
+        step = Step.new /(he|she) is (.*)/ do |pronoun, adjective|
+          $pronoun = pronoun
+          $adjective = adjective
+        end
+        instance = Object.new
+        
+        # when
+        args = step.parse_args("he is cool")
+        step.perform(instance, *args)
+        
+        # then
+        $pronoun.should == "he"
+        $adjective.should == "cool"
+      end
+
     end
   end
 end