rspec 1.1.2 → 1.1.3

data/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/spec/spec/runner/resources/a_spec.rb

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

data/spec/spec/runner/spec.opts

@@ -0,0 +1,2 @@
+--diff
+--colour

data/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/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/spec/spec/runner/spec_spaced.opts

@@ -0,0 +1,2 @@
+--diff --colour
+--format s

data/spec/spec/spec_classes.rb

@@ -122,6 +122,10 @@ module Custom
     def initialize(options)
       @options = options
     end
+
+    def diff_as_object(target, expected)
+      ""
+    end
   end
 end
 

data/spec/spec/story/step_spec.rb

@@ -58,11 +58,21 @@ 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
@@ -80,6 +90,18 @@ module Spec
         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

data/spec/spec/story/world_spec.rb

@@ -298,12 +298,18 @@ module Spec
         World.add_listener(mock_listener2)
 
         # expect
+        mock_listener1.should_receive(:step_upcoming).with(:given, 'a context')
         mock_listener1.should_receive(:step_succeeded).with(:given, 'a context')
+        mock_listener1.should_receive(:step_upcoming).with(:when, 'an event')
         mock_listener1.should_receive(:step_succeeded).with(:when, 'an event')
+        mock_listener1.should_receive(:step_upcoming).with(:then, 'an outcome')
         mock_listener1.should_receive(:step_succeeded).with(:then, 'an outcome')
 
+        mock_listener2.should_receive(:step_upcoming).with(:given, 'a context')
         mock_listener2.should_receive(:step_succeeded).with(:given, 'a context')
+        mock_listener2.should_receive(:step_upcoming).with(:when, 'an event')
         mock_listener2.should_receive(:step_succeeded).with(:when, 'an event')
+        mock_listener2.should_receive(:step_upcoming).with(:then, 'an outcome')
         mock_listener2.should_receive(:step_succeeded).with(:then, 'an outcome')
 
         # when
@@ -325,6 +331,7 @@ module Spec
         world = World.create
 
         # expect
+        mock_listener.should_receive(:step_upcoming).with(:given, 'a context')
         mock_listener.should_receive(:step_succeeded).with(:given, 'a context')
 
         # when

data/stories/interop/test_case_with_should_methods

@@ -7,7 +7,7 @@ Story: Test::Unit::TestCase extended by rspec with should methods
   Scenario: Run with ruby
     Given the file test/test_case_with_should_methods.rb
     When I run it with the ruby interpreter
-    Then PENDING the exit code should be 256
+    Then the exit code should be 256
     And the stdout should match "5 examples, 3 failures"
 
   Scenario: Run with spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-15 00:00:00 -06:00
+date: 2008-01-31 00:00:00 -06:00
 default_executable: spec
 dependencies: []
 
@@ -140,11 +140,16 @@ files:
 - lib/spec/translator.rb
 - lib/spec/version.rb
 - lib/spec.rb
+- spec/autotest
 - spec/autotest/discover_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/autotest_helper.rb
+- spec/autotest_matchers.rb
+- spec/README.jruby
 - spec/rspec_suite.rb
 - spec/ruby_forker.rb
+- spec/spec
+- spec/spec/example
 - spec/spec/example/configuration_spec.rb
 - spec/spec/example/example_group_class_definition_spec.rb
 - spec/spec/example/example_group_factory_spec.rb
@@ -159,15 +164,30 @@ files:
 - spec/spec/example/predicate_matcher_spec.rb
 - spec/spec/example/shared_example_group_spec.rb
 - spec/spec/example/subclassing_example_group_spec.rb
+- spec/spec/expectations
+- spec/spec/expectations/differs
 - spec/spec/expectations/differs/default_spec.rb
+- spec/spec/expectations/extensions
 - spec/spec/expectations/extensions/object_spec.rb
 - spec/spec/expectations/fail_with_spec.rb
+- spec/spec/extensions
 - spec/spec/extensions/main_spec.rb
+- spec/spec/interop
+- spec/spec/interop/test
+- spec/spec/interop/test/unit
+- spec/spec/interop/test/unit/resources
+- spec/spec/interop/test/unit/resources/spec_that_fails.rb
+- spec/spec/interop/test/unit/resources/spec_that_passes.rb
+- spec/spec/interop/test/unit/resources/spec_with_errors.rb
+- spec/spec/interop/test/unit/resources/test_case_that_fails.rb
+- spec/spec/interop/test/unit/resources/test_case_that_passes.rb
+- spec/spec/interop/test/unit/resources/test_case_with_errors.rb
+- spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb
+- spec/spec/interop/test/unit/spec_spec.rb
 - spec/spec/interop/test/unit/test_unit_spec_helper.rb
 - spec/spec/interop/test/unit/testcase_spec.rb
-- spec/spec/interop/test/unit/testcase_spec_with_test_unit.rb
 - spec/spec/interop/test/unit/testsuite_adapter_spec.rb
-- spec/spec/interop/test/unit/testsuite_adapter_spec_with_test_unit.rb
+- spec/spec/matchers
 - spec/spec/matchers/be_close_spec.rb
 - spec/spec/matchers/be_spec.rb
 - spec/spec/matchers/change_spec.rb
@@ -188,6 +208,7 @@ files:
 - spec/spec/matchers/satisfy_spec.rb
 - spec/spec/matchers/simple_matcher_spec.rb
 - spec/spec/matchers/throw_symbol_spec.rb
+- spec/spec/mocks
 - spec/spec/mocks/any_number_of_times_spec.rb
 - spec/spec/mocks/argument_expectation_spec.rb
 - spec/spec/mocks/at_least_spec.rb
@@ -215,21 +236,35 @@ files:
 - spec/spec/mocks/record_messages_spec.rb
 - spec/spec/mocks/stub_spec.rb
 - spec/spec/mocks/twice_counts_spec.rb
+- spec/spec/package
 - spec/spec/package/bin_spec_spec.rb
+- spec/spec/runner
 - spec/spec/runner/class_and_argument_parser_spec.rb
 - spec/spec/runner/command_line_spec.rb
 - spec/spec/runner/drb_command_line_spec.rb
+- spec/spec/runner/empty_file.txt
+- spec/spec/runner/examples.txt
 - spec/spec/runner/execution_context_spec.rb
+- spec/spec/runner/failed.txt
+- spec/spec/runner/formatter
 - spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb
 - spec/spec/runner/formatter/failing_examples_formatter_spec.rb
+- spec/spec/runner/formatter/html_formatted-1.8.4.html
+- spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html
+- spec/spec/runner/formatter/html_formatted-1.8.5.html
+- spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html
+- spec/spec/runner/formatter/html_formatted-1.8.6.html
 - spec/spec/runner/formatter/html_formatter_spec.rb
 - spec/spec/runner/formatter/profile_formatter_spec.rb
 - spec/spec/runner/formatter/progress_bar_formatter_spec.rb
 - spec/spec/runner/formatter/snippet_extractor_spec.rb
 - spec/spec/runner/formatter/spec_mate_formatter_spec.rb
 - spec/spec/runner/formatter/specdoc_formatter_spec.rb
+- spec/spec/runner/formatter/story
 - spec/spec/runner/formatter/story/html_formatter_spec.rb
 - spec/spec/runner/formatter/story/plain_text_formatter_spec.rb
+- spec/spec/runner/formatter/text_mate_formatted-1.8.4.html
+- spec/spec/runner/formatter/text_mate_formatted-1.8.6.html
 - spec/spec/runner/heckle_runner_spec.rb
 - spec/spec/runner/heckler_spec.rb
 - spec/spec/runner/noisy_backtrace_tweaker_spec.rb
@@ -240,13 +275,24 @@ files:
 - spec/spec/runner/output_one_time_spec.rb
 - spec/spec/runner/quiet_backtrace_tweaker_spec.rb
 - spec/spec/runner/reporter_spec.rb
+- spec/spec/runner/resources
+- spec/spec/runner/resources/a_bar.rb
+- spec/spec/runner/resources/a_foo.rb
+- spec/spec/runner/resources/a_spec.rb
+- spec/spec/runner/spec.opts
+- spec/spec/runner/spec_parser
+- spec/spec/runner/spec_parser/spec_parser_fixture.rb
 - spec/spec/runner/spec_parser_spec.rb
+- spec/spec/runner/spec_spaced.opts
 - spec/spec/runner_spec.rb
 - spec/spec/spec_classes.rb
+- spec/spec/story
 - spec/spec/story/builders.rb
+- spec/spec/story/extensions
 - spec/spec/story/extensions/main_spec.rb
 - spec/spec/story/extensions_spec.rb
 - spec/spec/story/given_scenario_spec.rb
+- spec/spec/story/runner
 - spec/spec/story/runner/plain_text_story_runner_spec.rb
 - spec/spec/story/runner/scenario_collector_spec.rb
 - spec/spec/story/runner/scenario_runner_spec.rb
@@ -262,6 +308,7 @@ files:
 - spec/spec/story/story_spec.rb
 - spec/spec/story/world_spec.rb
 - spec/spec/translator_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - examples/pure
 - examples/pure/autogenerated_docstrings_example.rb
@@ -324,6 +371,22 @@ files:
 - examples/stories/helper.rb
 - examples/stories/steps
 - examples/stories/steps/addition_steps.rb
+- failing_examples/diffing_spec.rb
+- failing_examples/failing_autogenerated_docstrings_example.rb
+- failing_examples/failure_in_setup.rb
+- failing_examples/failure_in_teardown.rb
+- failing_examples/mocking_example.rb
+- failing_examples/mocking_with_flexmock.rb
+- failing_examples/mocking_with_mocha.rb
+- failing_examples/mocking_with_rr.rb
+- failing_examples/partial_mock_example.rb
+- failing_examples/predicate_example.rb
+- failing_examples/raising_example.rb
+- failing_examples/README.txt
+- failing_examples/spec_helper.rb
+- failing_examples/syntax_error_example.rb
+- failing_examples/team_spec.rb
+- failing_examples/timeout_behaviour.rb
 - plugins/mock_frameworks
 - plugins/mock_frameworks/flexmock.rb
 - plugins/mock_frameworks/mocha.rb
@@ -359,6 +422,23 @@ files:
 - stories/resources/test
 - stories/resources/test/spec_and_test_together.rb
 - stories/resources/test/test_case_with_should_methods.rb
+- pre_commit/lib
+- pre_commit/lib/pre_commit
+- pre_commit/lib/pre_commit/core.rb
+- pre_commit/lib/pre_commit/pre_commit.rb
+- pre_commit/lib/pre_commit/rspec.rb
+- pre_commit/lib/pre_commit/rspec_on_rails.rb
+- pre_commit/lib/pre_commit.rb
+- pre_commit/spec
+- pre_commit/spec/pre_commit
+- pre_commit/spec/pre_commit/pre_commit_spec.rb
+- pre_commit/spec/pre_commit/rspec_on_rails_spec.rb
+- pre_commit/spec/spec_helper.rb
+- pre_commit/spec/spec_suite.rb
+- rake_tasks/examples.rake
+- rake_tasks/examples_with_rcov.rake
+- rake_tasks/failing_examples_with_html.rake
+- rake_tasks/verify_rcov.rake
 has_rdoc: true
 homepage: http://rspec.rubyforge.org
 post_install_message: 
@@ -389,6 +469,6 @@ rubyforge_project: rspec
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: RSpec-1.1.2 (build 20080114022430) - BDD for Ruby http://rspec.rubyforge.org/
+summary: RSpec-1.1.3 (build 20080131122909) - BDD for Ruby http://rspec.rubyforge.org/
 test_files: []