rspec-core 2.0.0.beta.10 → 2.0.0.beta.11

data/README.markdown

@@ -63,18 +63,6 @@ Use the documentation formatter to see the resulting spec:
     Finished in 0.000379 seconds
     1 example, 0 failures
 
-## Configuration
-
-You can define runtime configuration options in four places. They
-are loaded and processed in this order:
-
-* ~/.rspec
-* .rspec
-* RSpec.configure
-* command line
-
-Run `rspec --help` to see supported configuration options.
-
 #### Also see
 
 * [http://github.com/rspec/rspec](http://github.com/rspec/rspec)

data/Upgrade.markdown

@@ -1,11 +1,29 @@
 # Upgrade to rspec-core-2.0
 
-## What's changed
+## What's changed since rspec-1
 
-### RSpec namespace
+### rspec command
 
-The root namespace is now `RSpec` instead of `Spec`, and the root directory
-under `lib` is `rspec` instead of `spec`.
+The command to run specs is now `rspec` instead of `spec`.
+
+    rspec ./spec
+
+### autotest
+
+RSpec-2 works with autotest as follows:
+
+    # in ./autotest/discover.rb
+    Autotest.add_discovery { "rspec2" }
+
+    # command line
+    $ autotest
+
+The `autospec` command is a thing of the past. 
+
+### RSpec
+
+The root namespace (top level module ) is now `RSpec` instead of `Spec`, and
+the root directory under `lib` within all of the `rspec` gems is `rspec` instead of `spec`.
 
 ### Configuration
 
@@ -15,11 +33,15 @@ Typically in `spec/spec_helper.rb`, configuration is now done like this:
       # ....
     end
 
-### rspec commmand
+### .rspec
 
-The command to run specs is now `rspec` instead of `spec`.
+Command line options can be persisted in a `.rspec` file in a project. You
+can also store a `.rspec` file in your home directory (`~/.rspec`) with global
+options. Precedence is:
 
-    rspec ./spec
+    command line
+    ./.rspec
+    ~/.rspec
 
 ## What's new
 
@@ -35,6 +57,8 @@ like the file and line number on which it was declared, the arguments passed to
 argument passed to `describe` or `it`, allowing us to pre and post-process
 each example in a variety of ways.
 
+### Filtering
+
 The most obvious use is for filtering the run. For example:
 
     # in spec/spec_helper.rb

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.10
+2.0.0.beta.11

data/features/hooks/before_and_after_hooks.feature

@@ -166,6 +166,10 @@ Feature: before and after hooks
         example "in outer group" do
         end
 
+        after(:all) do
+          puts "outer after all"
+        end
+
         describe "nested group" do
           before(:all) do
             puts "inner before all"
@@ -179,10 +183,6 @@ Feature: before and after hooks
           end
         end
 
-        after(:all) do
-          puts "outer after all"
-        end
-
       end
       """
     When I run "rspec ./before_and_after_all_spec.rb"
@@ -197,6 +197,42 @@ Feature: before and after hooks
     Then I should see "1 example, 0 failures"
     Then I should see matching /outer before all\n.outer after all\n\n\n\nFinished/
 
+  Scenario: before/after all blocks have access to state
+    Given a file named "before_and_after_all_spec.rb" with:
+      """
+      describe "before and after callbacks" do
+        before(:all) do
+          @outer_state = "set in outer before all"
+        end
+
+        example "in outer group" do
+          @outer_state.should eq("set in outer before all")
+        end
+
+        describe "nested group" do
+          before(:all) do
+            @inner_state = "set in inner before all"
+          end
+
+          example "in nested group" do
+            @outer_state.should eq("set in outer before all")
+            @inner_state.should eq("set in inner before all")
+          end
+
+          after(:all) do
+            @inner_state.should eq("set in inner before all")
+          end
+        end
+
+        after(:all) do
+          # p @outer_state.nil?
+          @outer_state.should eq("set in outer before all")
+        end
+      end
+      """
+    When I run "rspec ./before_and_after_all_spec.rb"
+    Then I should see "2 examples, 0 failures"
+
   Scenario: exception in before(:each) is captured and reported as failure
     Given a file named "error_in_before_each_spec.rb" with:
       """

data/lib/rspec/core/configuration_options.rb

@@ -71,7 +71,7 @@ module RSpec
       def local_options_file(options)
         return options[:options_file] if options[:options_file]
         return LOCAL_OPTIONS_FILE if File.exist?(LOCAL_OPTIONS_FILE)
-        RSpec.deprecate("spec/spec.opts", ".rspec or ~/.rspec", "2.0.0") if File.exist?("spec/spec.opts")
+        RSpec.deprecate("spec/spec.opts", "./.rspec or ~/.rspec", "2.0.0") if File.exist?("spec/spec.opts")
         "spec/spec.opts"
       end
     end

data/lib/rspec/core/example_group.rb

@@ -156,13 +156,13 @@ module RSpec
 
       def self.eval_after_alls(running_example)
         return if filtered_examples.empty?
+        before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
         ancestors.each do |ancestor|
           until ancestor.after_alls.empty?
             running_example.instance_eval &ancestor.after_alls.pop
           end
         end
         world.run_hook(:after, :all, self, running_example)
-        before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
       def self.run(reporter)

data/lib/rspec/core/subject.rb

@@ -9,7 +9,7 @@ module RSpec
       end
 
       def subject
-        attribute_of_subject || original_subject
+        using_attribute? ? attribute_of_subject : original_subject
       end
 
       # When +should+ is called with no explicit receiver, the call is
@@ -80,7 +80,7 @@ module RSpec
       end
 
       def attribute_of_subject
-        original_subject.send(running_example.description) if using_attribute? 
+        original_subject.send(running_example.description) if using_attribute?
       end
 
       def using_attribute?

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.10"
+  s.version = "2.0.0.beta.11"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-06-02}
+  s.date = %q{2010-06-06}
   s.description = %q{RSpec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
      "License.txt",
      "README.markdown",
      "Rakefile",
-     "TODO.markdown",
      "Upgrade.markdown",
      "VERSION",
      "autotest/discover.rb",
@@ -131,7 +130,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.10
+  Thank you for installing rspec-core-2.0.0.beta.11
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -143,7 +142,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.10}
+  s.summary = %q{rspec-core-2.0.0.beta.11}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -183,19 +182,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.10"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.10"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.11"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.10"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.10"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.11"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.10"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.10"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.11"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.11"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/example_group_spec.rb

@@ -238,6 +238,17 @@ module RSpec::Core
         ]
       end
 
+      it "accesses before(:all) state in after(:all)" do
+        group = ExampleGroup.describe
+        group.before(:all) { @ivar = "value" }
+        group.after(:all)  { @ivar.should eq("value") }
+        group.example("ignore") {  }
+
+        expect do
+          group.run_all
+        end.to_not raise_error
+      end
+
       it "exposes the around each blocks at after_alls" do
         group = ExampleGroup.describe
         group.around(:each) { 'foo' }
@@ -439,6 +450,17 @@ module RSpec::Core
       context "subject modified in before block" do
         before { subject.class.should == RSpec::Core::ExampleGroup }
       end
+
+      context "with nil value" do
+        subject do
+          Class.new do
+            def nil_value
+              nil
+            end
+          end.new
+        end
+        its(:nil_value) { should be_nil }
+      end
     end
 
     describe "#top_level_description" do

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 10
-  version: 2.0.0.beta.10
+  - 11
+  version: 2.0.0.beta.11
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -05:00
+date: 2010-06-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 10
-        version: 2.0.0.beta.10
+        - 11
+        version: 2.0.0.beta.11
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 10
-        version: 2.0.0.beta.10
+        - 11
+        version: 2.0.0.beta.11
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,6 @@ files:
 - License.txt
 - README.markdown
 - Rakefile
-- TODO.markdown
 - Upgrade.markdown
 - VERSION
 - autotest/discover.rb
@@ -207,7 +206,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.10
+    Thank you for installing rspec-core-2.0.0.beta.11
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -241,7 +240,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.10
+summary: rspec-core-2.0.0.beta.11
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb

data/TODO.markdown

@@ -1,15 +0,0 @@
-### RSpec Core
-
-* support the following concepts from rspec-1.2.x
-  * run options
-    * from command line
-    * in rake task definitions
-  * formatters
-* For self testing
-** shared example groups should not be merged into the real 'world'
-* make sure all behaviour refs are now examplegroup
-
-### Maxwell
-
-* need to figure out how maxwell will allow us to mix all the rails testing
-  facilities with rspec when working with rails.