rspec-core 2.8.0.rc1 → 2.8.0.rc2

data/spec/rspec/core/option_parser_spec.rb

@@ -109,6 +109,11 @@ module RSpec::Core
             options = Parser.parse!([option, 'foo:false', option, 'bar:true', option, 'foo:true'])
             options[:inclusion_filter].should eq(:foo => true, :bar => true)
           end
+
+          it "treats 'any_string' as 'any_string'" do
+            options = Parser.parse!([option, 'foo:any_string'])
+            options[:inclusion_filter].should eq(:foo => 'any_string')
+          end
         end
 
         context "with ~" do

data/spec/rspec/core/pending_example_spec.rb

@@ -1,14 +1,46 @@
 require 'spec_helper'
 
 describe "an example" do
+  matcher :be_pending_with do |message|
+    match do |example|
+      example.pending? && example.metadata[:execution_result][:pending_message] == message
+    end
+
+    failure_message_for_should do |example|
+      "expected: example pending with #{message.inspect}\n     got: #{example.metadata[:execution_result][:pending_message].inspect}"
+    end
+  end
+
+  context "declared pending with metadata" do
+    it "uses the value assigned to :pending as the message" do
+      group = RSpec::Core::ExampleGroup.describe('group') do
+        example "example", :pending => 'just because' do
+        end
+      end
+      example = group.examples.first
+      example.run(group.new, stub.as_null_object)
+      example.should be_pending_with('just because')
+    end
+
+    it "sets the message to 'No reason given' if :pending => true" do
+      group = RSpec::Core::ExampleGroup.describe('group') do
+        example "example", :pending => true do
+        end
+      end
+      example = group.examples.first
+      example.run(group.new, stub.as_null_object)
+      example.should be_pending_with('No reason given')
+    end
+  end
+
   context "with no block" do
-    it "is listed as pending with 'Not Yet Implemented'" do
+    it "is listed as pending with 'Not yet implemented'" do
       group = RSpec::Core::ExampleGroup.describe('group') do
         it "has no block"
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with('Not Yet Implemented')
+      example.should be_pending_with('Not yet implemented')
     end
   end
 
@@ -21,7 +53,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
+      example.should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
     end
   end
 
@@ -94,7 +126,7 @@ describe "an example" do
         end
 
         it "is listed as pending with the default message when no message is given" do
-          run_example.should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
+          run_example.should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
       end
 
@@ -104,7 +136,7 @@ describe "an example" do
         end
 
         it "is listed as pending with the default message when no message is given" do
-          run_example(:if => true).should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
+          run_example(:if => true).should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
       end
 
@@ -128,7 +160,7 @@ describe "an example" do
         end
 
         it "is listed as pending with the default message when no message is given" do
-          run_example(:unless => false).should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
+          run_example(:unless => false).should be_pending_with(RSpec::Core::Pending::NO_REASON_GIVEN)
         end
       end
     end
@@ -150,15 +182,15 @@ describe "an example" do
 
       context "when given no options" do
         it "fails with a PendingExampleFixedError" do
-          run_example("just because").should fail_with(RSpec::Core::PendingExampleFixedError)
-          run_example.should                 fail_with(RSpec::Core::PendingExampleFixedError)
+          run_example("just because").should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          run_example.should                 fail_with(RSpec::Core::Pending::PendingExampleFixedError)
         end
       end
 
       context "when given a truthy :if option" do
         it "fails with a PendingExampleFixedError" do
-          run_example("just because", :if => true).should fail_with(RSpec::Core::PendingExampleFixedError)
-          run_example(                :if => true).should fail_with(RSpec::Core::PendingExampleFixedError)
+          run_example("just because", :if => true).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          run_example(                :if => true).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
         end
       end
 
@@ -178,8 +210,8 @@ describe "an example" do
 
       context "when given a falsey :unless option" do
         it "fails with a PendingExampleFixedError" do
-          run_example("just because", :unless => false).should fail_with(RSpec::Core::PendingExampleFixedError)
-          run_example(                :unless => false).should fail_with(RSpec::Core::PendingExampleFixedError)
+          run_example("just because", :unless => false).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
+          run_example(                :unless => false).should fail_with(RSpec::Core::Pending::PendingExampleFixedError)
         end
       end
     end

data/spec/rspec/core/project_initializer_spec.rb

@@ -0,0 +1,130 @@
+require "spec_helper"
+
+module RSpec::Core
+  describe ProjectInitializer, :fakefs do
+    describe "#run" do
+      context "with no args" do
+        let(:command_line_config) { ProjectInitializer.new }
+
+        before do
+          command_line_config.stub(:warn)
+          command_line_config.stub(:puts)
+          command_line_config.stub(:gets => 'no')
+        end
+
+        context "with no .rspec file" do
+          it "says it's creating .rspec " do
+            command_line_config.should_receive(:puts).with(/create\s+\.rspec/)
+            command_line_config.run
+          end
+
+          it "generates a .rspec" do
+            command_line_config.run
+            File.read('.rspec').should eq('')
+          end
+        end
+
+        context "with a .rspec file" do
+          it "says .rspec exists" do
+            FileUtils.touch('.rspec')
+            command_line_config.should_receive(:puts).with(/exist\s+\.rspec/)
+            command_line_config.run
+          end
+
+          it "doesn't create a new one" do
+            File.open('.rspec', 'w') {|f| f << '--color'}
+            command_line_config.run
+            File.read('.rspec').should eq('--color')
+          end
+        end
+
+        context "with no spec/spec_helper.rb file" do
+          it "says it's creating spec/spec_helper.rb " do
+            command_line_config.should_receive(:puts).with(/create\s+spec\/spec_helper.rb/)
+            command_line_config.run
+          end
+
+          it "generates a spec/spec_helper.rb" do
+            command_line_config.run
+            File.read('spec/spec_helper.rb').should eq('')
+          end
+        end
+
+        context "with a spec/spec_helper.rb file" do
+          before { FileUtils.mkdir('spec') }
+
+          it "says spec/spec_helper.rb exists" do
+            FileUtils.touch('spec/spec_helper.rb')
+            command_line_config.should_receive(:puts).with(/exist\s+spec\/spec_helper.rb/)
+            command_line_config.run
+          end
+
+          it "doesn't create a new one" do
+            random_content = "content #{rand}"
+            File.open('spec/spec_helper.rb', 'w') {|f| f << random_content}
+            command_line_config.run
+            File.read('spec/spec_helper.rb').should eq(random_content)
+          end
+        end
+
+        context "with autotest/discover.rb" do
+          before do
+            FileUtils.mkdir('autotest')
+            FileUtils.touch 'autotest/discover.rb'
+          end
+
+          it "asks whether to delete the file" do
+            command_line_config.should_receive(:puts).with(/delete/)
+            command_line_config.run
+          end
+
+          it "removes it if confirmed" do
+            command_line_config.stub(:gets => 'yes')
+            command_line_config.run
+            File.exist?('autotest/discover.rb').should be_false
+          end
+
+          it "leaves it if not confirmed" do
+            command_line_config.stub(:gets => 'no')
+            command_line_config.run
+            File.exist?('autotest/discover.rb').should be_true
+          end
+        end
+
+        context "with lib/tasks/rspec.rake" do
+          before do
+            FileUtils.mkdir_p('lib/tasks')
+            FileUtils.touch 'lib/tasks/rspec.rake'
+          end
+
+          it "asks whether to delete the file" do
+            command_line_config.should_receive(:puts).with(/delete/)
+            command_line_config.run
+          end
+
+          it "removes it if confirmed" do
+            command_line_config.stub(:gets => 'yes')
+            command_line_config.run
+            File.exist?('lib/tasks/rspec.rake').should be_false
+          end
+
+          it "leaves it if not confirmed" do
+            command_line_config.stub(:gets => 'no')
+            command_line_config.run
+            File.exist?('lib/tasks/rspec.rake').should be_true
+          end
+        end
+      end
+
+      context "given an arg" do
+        it "warns if arg received (no longer necessary)" do
+          config = ProjectInitializer.new("another_arg")
+          config.stub(:puts)
+          config.stub(:gets => 'no')
+          config.should_receive(:warn).with(/no longer.*another_arg was ignored/)
+          config.run
+        end
+      end
+    end
+  end
+end

data/spec/rspec/core/rake_task_spec.rb

@@ -75,7 +75,7 @@ module RSpec::Core
       context "with rcov=false (default)" do
         it "adds the rspec_opts" do
           task.rspec_opts = "-Ifoo"
-          spec_command.should =~ /rspec -Ifoo/
+          spec_command.should =~ /rspec.*-Ifoo/
         end
       end
     end

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ Spork.prefork do
   require 'rspec/autorun'
   require 'autotest/rspec2'
   require 'aruba/api'
+  require 'fakefs/spec_helpers'
 
   Dir['./spec/support/**/*.rb'].map {|f| require f}
 
@@ -78,6 +79,7 @@ Spork.prefork do
     c.color = !in_editor?
     c.filter_run :focus
     c.filter_run :foo
+    c.include FakeFS::SpecHelpers, :fakefs
     c.run_all_when_everything_filtered = true
     c.filter_run_excluding :ruby => lambda {|version|
       case version.to_s

data/spec/support/matchers.rb

@@ -20,16 +20,6 @@ RSpec::Matchers.define :map_specs do |specs|
   end
 end
 
-RSpec::Matchers.define :be_pending_with do |message|
-  match do |example|
-    example.metadata[:pending] && example.metadata[:execution_result][:pending_message] == message
-  end
-
-  failure_message_for_should do |example|
-    "expected example to pending with #{message.inspect}, got #{example.metadata[:execution_result][:pending_message].inspect}"
-  end
-end
-
 RSpec::Matchers.define :fail_with do |exception_klass|
   match do |example|
     failure_reason(example, exception_klass).nil?
@@ -70,6 +60,6 @@ RSpec::Matchers.define :pass do
 end
 
 RSpec::Matchers.module_eval do
-  alias have_failed_with fail_with
-  alias have_passed pass
+  alias_method :have_failed_with, :fail_with
+  alias_method :have_passed, :pass
 end

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 15424215
+  hash: 15424209
   prerelease: 6
   segments: 
   - 2
   - 8
   - 0
   - rc
-  - 1
-  version: 2.8.0.rc1
+  - 2
+  version: 2.8.0.rc2
 platform: ruby
 authors: 
-- Chad Humphries
+- Steven Baker
 - David Chelimsky
+- Chad Humphries
 autorequire: 
 bindir: exe
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2011-12-20 00:00:00 Z
 dependencies: []
 
 description: BDD for Ruby. RSpec runner and example groups.
-email: rspec-users@rubyforge.org;
+email: rspec-users@rubyforge.org
 executables: 
 - autospec
 - rspec
@@ -30,6 +31,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.md
+- License.txt
 files: 
 - lib/autotest/discover.rb
 - lib/autotest/rspec2.rb
@@ -37,14 +39,12 @@ files:
 - lib/rspec/core.rb
 - lib/rspec/core/backward_compatibility.rb
 - lib/rspec/core/command_line.rb
-- lib/rspec/core/command_line_configuration.rb
 - lib/rspec/core/configuration.rb
 - lib/rspec/core/configuration_options.rb
 - lib/rspec/core/deprecation.rb
 - lib/rspec/core/drb_command_line.rb
 - lib/rspec/core/drb_options.rb
 - lib/rspec/core/dsl.rb
-- lib/rspec/core/errors.rb
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
 - lib/rspec/core/extensions.rb
@@ -73,6 +73,7 @@ files:
 - lib/rspec/core/mocking/with_rspec.rb
 - lib/rspec/core/option_parser.rb
 - lib/rspec/core/pending.rb
+- lib/rspec/core/project_initializer.rb
 - lib/rspec/core/rake_task.rb
 - lib/rspec/core/reporter.rb
 - lib/rspec/core/ruby_project.rb
@@ -84,15 +85,16 @@ files:
 - lib/rspec/core/world.rb
 - lib/rspec/monkey.rb
 - lib/rspec/monkey/spork/test_framework/rspec.rb
+- License.txt
 - README.md
 - features/Autotest.md
 - features/README.md
 - features/Upgrade.md
 - features/command_line/README.md
-- features/command_line/configure.feature
 - features/command_line/example_name_option.feature
 - features/command_line/exit_status.feature
 - features/command_line/format_option.feature
+- features/command_line/init.feature
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
 - features/command_line/order.feature
@@ -141,7 +143,6 @@ files:
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/command_line/order_spec.rb
-- spec/rspec/core/command_line_configuration_spec.rb
 - spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/command_line_spec_output.txt
 - spec/rspec/core/configuration_options_spec.rb
@@ -175,6 +176,7 @@ files:
 - spec/rspec/core/metadata_spec.rb
 - spec/rspec/core/option_parser_spec.rb
 - spec/rspec/core/pending_example_spec.rb
+- spec/rspec/core/project_initializer_spec.rb
 - spec/rspec/core/rake_task_spec.rb
 - spec/rspec/core/reporter_spec.rb
 - spec/rspec/core/resources/a_bar.rb
@@ -198,9 +200,9 @@ files:
 - spec/support/spec_files.rb
 - exe/autospec
 - exe/rspec
-homepage: http://github.com/rspec
-licenses: []
-
+homepage: http://github.com/rspec/rspec-core
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -232,16 +234,16 @@ rubyforge_project: rspec
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.8.0.rc1
+summary: rspec-core-2.8.0.rc2
 test_files: 
 - features/Autotest.md
 - features/README.md
 - features/Upgrade.md
 - features/command_line/README.md
-- features/command_line/configure.feature
 - features/command_line/example_name_option.feature
 - features/command_line/exit_status.feature
 - features/command_line/format_option.feature
+- features/command_line/init.feature
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
 - features/command_line/order.feature
@@ -290,7 +292,6 @@ test_files:
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/command_line/order_spec.rb
-- spec/rspec/core/command_line_configuration_spec.rb
 - spec/rspec/core/command_line_spec.rb
 - spec/rspec/core/command_line_spec_output.txt
 - spec/rspec/core/configuration_options_spec.rb
@@ -324,6 +325,7 @@ test_files:
 - spec/rspec/core/metadata_spec.rb
 - spec/rspec/core/option_parser_spec.rb
 - spec/rspec/core/pending_example_spec.rb
+- spec/rspec/core/project_initializer_spec.rb
 - spec/rspec/core/rake_task_spec.rb
 - spec/rspec/core/reporter_spec.rb
 - spec/rspec/core/resources/a_bar.rb