dchelimsky-rspec 1.1.12 → 1.1.99.1

data/History.txt

@@ -1,3 +1,38 @@
+=== Maintenance
+
+WARNINGS:
+
+  * If you use the ruby command to run specs instead of the spec command, you'll
+    need to require 'spec/autorun' or they won't run. This won't affect you if
+    you use the spec command or the Spec::Rake::SpecTask that ships with RSpec.
+
+  * require 'spec/test/unit' to invoke test/unit interop if you're using
+    RSpec's core (this is handled implicitly with spec-rails)
+
+  * setup/teardown is gone - use before/after instead
+
+    * you can still use setup/teardown if you're using Test::Unit::TestCase as
+      the base ExampleGroup class (which is implicit in rspec-rails)
+
+* deprecations
+
+  * BaseTextFormatter#colourize - use colorize_failure instead.
+  * BaseTextFormatter#magenta - use red instead.
+
+* enhancements
+
+  * allow registering example groups with a path-like key (Pat Maddox)
+  * start DRb service at "druby://localhost:0" (Hongli Lai) - See http://redmine.ruby-lang.org/issues/show/496 
+  * consistent reporting of errors as failures
+  * added spec/test/unit as more intuitive path to loading test/unit interop lib
+  * added explicit autorun feature for running specs with ruby command
+  * added handling for does_not_match? for matchers that want to know the context in which they were called
+  
+* bug fixes
+
+  * support delegating operator matchers to subject with should_not
+  * all arguments are included if --drb is specified in spec.opts (Neil Buckley). Closes #671.
+
 === Version 1.1.12 / 2009-01-11
 
 WARNING: there was a stub/mock bug in 1.1.11 that allowed a structure that was

data/License.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2005-2008 The RSpec Development Team
+Copyright (c) 2005-2009 The RSpec Development Team
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -7,6 +7,7 @@ Rakefile
 TODO.txt
 bin/autospec
 bin/spec
+cucumber.yml
 examples/failing/README.txt
 examples/failing/diffing_spec.rb
 examples/failing/failing_autogenerated_docstrings_example.rb
@@ -31,11 +32,12 @@ examples/passing/custom_formatter.rb
 examples/passing/dynamic_spec.rb
 examples/passing/file_accessor.rb
 examples/passing/file_accessor_spec.rb
+examples/passing/filtered_formatter.rb
+examples/passing/filtered_formatter_example.rb
 examples/passing/greeter_spec.rb
 examples/passing/helper_method_example.rb
 examples/passing/io_processor.rb
 examples/passing/io_processor_spec.rb
-examples/passing/legacy_spec.rb
 examples/passing/mocking_example.rb
 examples/passing/multi_threaded_example_group_runner.rb
 examples/passing/nested_classes_example.rb
@@ -53,6 +55,7 @@ examples/passing/stack_spec_with_nested_example_groups.rb
 examples/passing/stubbing_example.rb
 examples/passing/yielding_example.rb
 examples/ruby1.9.compatibility/access_to_constants_spec.rb
+features-pending/cli/conditional_exclusion.feature
 features/before_and_after_blocks/before_and_after_blocks.feature
 features/example_groups/autogenerated_docstrings.feature
 features/example_groups/example_group_with_should_methods.feature
@@ -62,38 +65,42 @@ features/interop/examples_and_tests_together.feature
 features/interop/test_but_not_test_unit.feature
 features/interop/test_case_with_should_methods.feature
 features/mock_framework_integration/use_flexmock.feature
+features/mock_framework_integration/use_mocha.feature
+features/mock_framework_integration/use_rr.feature
 features/step_definitions/running_rspec.rb
 features/support/env.rb
-features/support/helpers/cmdline.rb
-features/support/helpers/story_helper.rb
 features/support/matchers/smart_match.rb
 init.rb
-lib/adapters/mock_frameworks/flexmock.rb
-lib/adapters/mock_frameworks/mocha.rb
-lib/adapters/mock_frameworks/rr.rb
-lib/adapters/mock_frameworks/rspec.rb
 lib/autotest/discover.rb
 lib/autotest/rspec.rb
 lib/spec.rb
+lib/spec/adapters/mock_frameworks/flexmock.rb
+lib/spec/adapters/mock_frameworks/mocha.rb
+lib/spec/adapters/mock_frameworks/rr.rb
+lib/spec/adapters/mock_frameworks/rspec.rb
+lib/spec/autorun.rb
 lib/spec/dsl.rb
 lib/spec/dsl/main.rb
 lib/spec/example.rb
 lib/spec/example/before_and_after_hooks.rb
 lib/spec/example/errors.rb
+lib/spec/example/example_description.rb
 lib/spec/example/example_group.rb
 lib/spec/example/example_group_factory.rb
+lib/spec/example/example_group_hierarchy.rb
 lib/spec/example/example_group_methods.rb
 lib/spec/example/example_matcher.rb
 lib/spec/example/example_methods.rb
 lib/spec/example/module_reopening_fix.rb
 lib/spec/example/pending.rb
+lib/spec/example/predicate_matchers.rb
 lib/spec/example/shared_example_group.rb
+lib/spec/example/subject.rb
 lib/spec/expectations.rb
 lib/spec/expectations/differs/default.rb
 lib/spec/expectations/errors.rb
 lib/spec/expectations/extensions.rb
 lib/spec/expectations/extensions/object.rb
-lib/spec/expectations/extensions/string_and_symbol.rb
 lib/spec/expectations/handler.rb
 lib/spec/interop/test.rb
 lib/spec/interop/test/unit/autorunner.rb
@@ -124,8 +131,8 @@ lib/spec/matchers/simple_matcher.rb
 lib/spec/matchers/throw_symbol.rb
 lib/spec/matchers/wrap_expectation.rb
 lib/spec/mocks.rb
-lib/spec/mocks/argument_constraints.rb
 lib/spec/mocks/argument_expectation.rb
+lib/spec/mocks/argument_matchers.rb
 lib/spec/mocks/error_generator.rb
 lib/spec/mocks/errors.rb
 lib/spec/mocks/extensions.rb
@@ -158,9 +165,6 @@ lib/spec/runner/formatter/profile_formatter.rb
 lib/spec/runner/formatter/progress_bar_formatter.rb
 lib/spec/runner/formatter/snippet_extractor.rb
 lib/spec/runner/formatter/specdoc_formatter.rb
-lib/spec/runner/formatter/story/html_formatter.rb
-lib/spec/runner/formatter/story/plain_text_formatter.rb
-lib/spec/runner/formatter/story/progress_bar_formatter.rb
 lib/spec/runner/formatter/text_mate_formatter.rb
 lib/spec/runner/heckle_runner.rb
 lib/spec/runner/heckle_runner_unsupported.rb
@@ -168,33 +172,15 @@ lib/spec/runner/option_parser.rb
 lib/spec/runner/options.rb
 lib/spec/runner/reporter.rb
 lib/spec/runner/spec_parser.rb
-lib/spec/story.rb
-lib/spec/story/extensions.rb
-lib/spec/story/extensions/main.rb
-lib/spec/story/extensions/regexp.rb
-lib/spec/story/extensions/string.rb
-lib/spec/story/given_scenario.rb
-lib/spec/story/runner.rb
-lib/spec/story/runner/plain_text_story_runner.rb
-lib/spec/story/runner/scenario_collector.rb
-lib/spec/story/runner/scenario_runner.rb
-lib/spec/story/runner/story_mediator.rb
-lib/spec/story/runner/story_parser.rb
-lib/spec/story/runner/story_runner.rb
-lib/spec/story/scenario.rb
-lib/spec/story/step.rb
-lib/spec/story/step_group.rb
-lib/spec/story/step_mother.rb
-lib/spec/story/story.rb
-lib/spec/story/world.rb
+lib/spec/test/unit.rb
 lib/spec/version.rb
+resources/helpers/cmdline.rb
 resources/rake/examples.rake
 resources/rake/examples_with_rcov.rake
 resources/rake/failing_examples_with_html.rake
 resources/rake/verify_rcov.rake
 resources/spec/example_group_with_should_methods.rb
 resources/spec/simple_spec.rb
-resources/spec/spec_with_flexmock.rb
 resources/test/spec_and_test_together.rb
 resources/test/spec_including_test_but_not_unit.rb
 resources/test/test_case_with_should_methods.rb
@@ -251,7 +237,6 @@ spec/spec/matchers/include_spec.rb
 spec/spec/matchers/match_array_spec.rb
 spec/spec/matchers/match_spec.rb
 spec/spec/matchers/matcher_methods_spec.rb
-spec/spec/matchers/mock_constraint_matchers_spec.rb
 spec/spec/matchers/operator_matcher_spec.rb
 spec/spec/matchers/raise_error_spec.rb
 spec/spec/matchers/respond_to_spec.rb
@@ -266,13 +251,13 @@ spec/spec/mocks/bug_report_10260_spec.rb
 spec/spec/mocks/bug_report_10263_spec.rb
 spec/spec/mocks/bug_report_11545_spec.rb
 spec/spec/mocks/bug_report_15719_spec.rb
-spec/spec/mocks/bug_report_496.rb
+spec/spec/mocks/bug_report_496_spec.rb
 spec/spec/mocks/bug_report_600_spec.rb
 spec/spec/mocks/bug_report_7611_spec.rb
 spec/spec/mocks/bug_report_7805_spec.rb
 spec/spec/mocks/bug_report_8165_spec.rb
 spec/spec/mocks/bug_report_8302_spec.rb
-spec/spec/mocks/failing_mock_argument_constraints_spec.rb
+spec/spec/mocks/failing_argument_matchers_spec.rb
 spec/spec/mocks/hash_including_matcher_spec.rb
 spec/spec/mocks/hash_not_including_matcher_spec.rb
 spec/spec/mocks/mock_ordering_spec.rb
@@ -285,7 +270,7 @@ spec/spec/mocks/once_counts_spec.rb
 spec/spec/mocks/options_hash_spec.rb
 spec/spec/mocks/partial_mock_spec.rb
 spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb
-spec/spec/mocks/passing_mock_argument_constraints_spec.rb
+spec/spec/mocks/passing_argument_matchers_spec.rb
 spec/spec/mocks/precise_counts_spec.rb
 spec/spec/mocks/record_messages_spec.rb
 spec/spec/mocks/stub_spec.rb
@@ -316,15 +301,12 @@ spec/spec/runner/formatter/nested_text_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/html_formatter_spec.rb
-spec/spec/runner/formatter/story/plain_text_formatter_spec.rb
-spec/spec/runner/formatter/story/progress_bar_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/formatter/text_mate_formatted-1.8.7.html
 spec/spec/runner/formatter/text_mate_formatted-1.9.1.html
+spec/spec/runner/formatter/text_mate_formatter_spec.rb
 spec/spec/runner/heckle_runner_spec.rb
 spec/spec/runner/heckler_spec.rb
 spec/spec/runner/noisy_backtrace_tweaker_spec.rb
@@ -347,37 +329,4 @@ 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/spec_spec.rb
-spec/spec/story/builders.rb
-spec/spec/story/extensions/main_spec.rb
-spec/spec/story/extensions_spec.rb
-spec/spec/story/given_scenario_spec.rb
-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
-spec/spec/story/runner/story_mediator_spec.rb
-spec/spec/story/runner/story_parser_spec.rb
-spec/spec/story/runner/story_runner_spec.rb
-spec/spec/story/runner_spec.rb
-spec/spec/story/scenario_spec.rb
-spec/spec/story/step_group_spec.rb
-spec/spec/story/step_mother_spec.rb
-spec/spec/story/step_spec.rb
-spec/spec/story/story_helper.rb
-spec/spec/story/story_spec.rb
-spec/spec/story/world_spec.rb
 spec/spec_helper.rb
-story_server/prototype/javascripts/builder.js
-story_server/prototype/javascripts/controls.js
-story_server/prototype/javascripts/dragdrop.js
-story_server/prototype/javascripts/effects.js
-story_server/prototype/javascripts/prototype.js
-story_server/prototype/javascripts/rspec.js
-story_server/prototype/javascripts/scriptaculous.js
-story_server/prototype/javascripts/slider.js
-story_server/prototype/javascripts/sound.js
-story_server/prototype/javascripts/unittest.js
-story_server/prototype/lib/server.rb
-story_server/prototype/stories.html
-story_server/prototype/stylesheets/rspec.css
-story_server/prototype/stylesheets/test.css

data/README.txt

@@ -12,10 +12,10 @@ examples.
 
 == FEATURES:
 
-* Spec::Example provides a framework for expressing executable code examples
+* Spec::Example provides a framework for organizing executable code examples
 * Spec::Expectations adds #should and #should_not to every object
 * Spec::Matchers provides Expression Matchers for use with #should and #should_not
-* Spec::Mocks is a full featured mocking/stubbing library
+* Spec::Mocks is a full featured mock object/stubbing library
 
 == SYNOPSIS:
 

data/Rakefile

@@ -28,23 +28,28 @@ end
   Rake.application.instance_variable_get('@tasks').delete(task)
 end
 
-task :verify_rcov => [:spec, :features]
-task :default => :verify_rcov
-
-# # Some of the tasks are in separate files since they are also part of the website documentation
+# Some of the tasks are in separate files since they are also part of the website documentation
 load File.dirname(__FILE__) + '/resources/rake/examples.rake'
 load File.dirname(__FILE__) + '/resources/rake/examples_with_rcov.rake'
 load File.dirname(__FILE__) + '/resources/rake/failing_examples_with_html.rake'
 load File.dirname(__FILE__) + '/resources/rake/verify_rcov.rake'
 
+task :default => [:verify_rcov, :features]
+
 desc "Run all specs"
 Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = ['--options', 'spec/spec.opts']
-  unless ENV['NO_RCOV']
+end
+
+namespace :spec do
+  desc "Run all specs with rcov"
+  Spec::Rake::SpecTask.new('rcov') do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--options', 'spec/spec.opts']
     t.rcov = true
     t.rcov_dir = 'coverage'
-    t.rcov_opts = ['--text-report', '--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
+    t.rcov_opts = ['--exclude', "lib/spec.rb,lib/spec/runner.rb,spec\/spec,bin\/spec,examples,\/gems,\/Library\/Ruby,\.autotest,#{ENV['GEM_HOME']}"]
   end
 end
 
@@ -86,4 +91,24 @@ task :verify_committed do
       raise "\n!!! Do a git commit first !!!\n\n" if line =~ /^#\s*modified:/
     end
   end
-end
+end
+
+namespace :update do
+  desc "update the manfest"
+  task :manifest do
+    system %q[touch Manifest.txt; rake check_manifest | grep -v "(in " | patch]
+  end
+  
+  desc "update the gemspec"
+  task :gemspec do
+    system %q[rake debug_gem | grep -v "(in " | grep -v "else" | grep -v "s.add_dependency(%q<hoe" | grep -v "s.add_dependency(%q<cuc" > `basename \\`pwd\\``.gemspec]
+  end
+end
+
+task :clobber => :clobber_tmp
+
+task :clobber_tmp do
+  cmd = %q[rm -r tmp]
+  puts cmd
+  system cmd if test ?d, 'tmp'
+end

data/TODO.txt

@@ -2,7 +2,6 @@
 
 Refactoring for 1.2.0
 
-* eliminate dependency from Spec::Example to Spec::Runner
 ** global predictate matchers should be stored in run_options
 * eliminate dependency on global options and configuration
 ** the only place they should exist is in the Runner, which should manage them
@@ -10,9 +9,15 @@ Refactoring for 1.2.0
 == Future
 
 * do SOMETHING with the website
-* extract spec/story to rspec-stories (new gem)
-* rename top level namespace to Rspec and commands to 'rspec' and 'autorspec'
-  * continue to support Spec 'spec' and 'autospec' as aliases for a reasonable time
 * separate the underlying framework from the DSL
   * be able to do everything with classes and methods
 * tweak raise_error rdoc to show only one arg
+
+== Ruby 1.9.1
+
+* no heckle (for now)
+
+== rspec-2.0
+
+* rename top level namespace to Rspec and commands to 'rspec' and 'autorspec'
+  * continue to support Spec 'spec' and 'autospec' as aliases for a reasonable time

data/bin/spec

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
-require 'spec'
+require 'spec/autorun'
 exit ::Spec::Runner::CommandLine.run

data/cucumber.yml

@@ -0,0 +1,2 @@
+default: --require features features
+pending: --require features features-pending

data/examples/failing/spec_helper.rb

@@ -1,3 +1,3 @@
 lib_path = File.expand_path(File.dirname(__FILE__) + "/../../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-require "spec"
+require 'spec/autorun'

data/examples/passing/filtered_formatter.rb

@@ -0,0 +1,18 @@
+$:.unshift File.join(File.dirname(__FILE__), "/../../lib")
+require 'spec/runner/formatter/nested_text_formatter'
+
+class FilteredFormatter < Spec::Runner::Formatter::NestedTextFormatter
+  def add_example_group(example_group)
+    if example_group.options[:show] == false
+      @showing = false
+    else
+      @showing = true
+      puts example_group.description 
+    end
+  end
+  
+  def example_passed(example)
+    puts "  " << example.description if @showing unless example.options[:show] == false
+  end
+end
+

data/examples/passing/filtered_formatter_example.rb

@@ -0,0 +1,31 @@
+# This demonstrates how you can write custom formatters to handle arbitrary
+# options passed to the +describe+ and +it+ methods. To see it in action, stand
+# in the project root and say:
+# 
+#   bin/spec -r examples/passing/filtered_formatter.rb examples/passing/filtered_formatter_example.rb -f FilteredFormatter
+#   
+# You should only see the examples and groups below that are not explicitly
+# marked :show => false
+#
+#   group 1
+#     example 1 a
+#   group 3
+#     example 3
+
+
+describe "group 1", :show => true do
+  it "example 1 a", :show => true do
+  end
+  it "example 1 b", :show => false do
+  end
+end
+
+describe "group 2", :show => false do
+  it "example 2" do
+  end
+end
+
+describe "group 3" do
+  it "example 3" do
+  end
+end

data/examples/passing/spec_helper.rb

@@ -1,3 +1,3 @@
 lib_path = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
-require 'spec'
+require 'spec/autorun'

data/examples/ruby1.9.compatibility/access_to_constants_spec.rb

@@ -12,33 +12,33 @@ module Foo
     def method_in_enclosing_module;end
     CONSTANT_IN_ENCLOSING_MODULE = 0
 
-    describe "Examples trying to access constants defined in an enclosing module" do 
+    describe "Examples trying to access constants defined in an enclosing module" do
 
-      it "can access Modules" do 
+      it "can access Modules" do
         ModuleInEnclosingModule
       end
-      it "can access Classes" do 
+      it "can access Classes" do
         ClassInEnclosingModule.new
       end
-      it "can access CONSTANTS" do 
+      it "can access CONSTANTS" do
         CONSTANT_IN_ENCLOSING_MODULE
       end
-      it "can NOT access methods" do 
+      it "can NOT access methods" do
         lambda {method_in_enclosing_module}.should raise_error(/undefined/)
       end
 
-      describe "from a nested example group" do 
+      describe "from a nested example group" do
 
-        it "can access Modules" do 
+        it "can access Modules" do
           ModuleInEnclosingModule
         end
-        it "can access Classes" do 
+        it "can access Classes" do
           ClassInEnclosingModule.new
         end
-        it "can access CONSTANTS" do 
+        it "can access CONSTANTS" do
           CONSTANT_IN_ENCLOSING_MODULE
         end
-        it "can NOT access methods" do 
+        it "can NOT access methods" do
           lambda {method_in_enclosing_module}.should raise_error(/undefined/)
         end
 
@@ -46,7 +46,7 @@ module Foo
 
     end
     
-    describe "Examples trying to access constants defined in the example group" do 
+    describe "Examples trying to access constants defined in the example group" do
       
       module ModuleDefinedInGroup;end
       class ClassDefinedInGroup; end 
@@ -56,13 +56,13 @@ module Foo
       it "can access Modules" do
         ModuleDefinedInGroup
       end
-      it "can access Classes" do 
+      it "can access Classes" do
         ClassDefinedInGroup.new
       end
-      it "can access CONSTANTS" do 
+      it "can access CONSTANTS" do
         CONSTANT_DEFINED_IN_GROUP
       end
-      it "can access methods" do 
+      it "can access methods" do
         method_defined_in_group
       end
       
@@ -70,17 +70,16 @@ module Foo
         it "can access Modules" do
           ModuleDefinedInGroup
         end
-        it "can access Classes" do 
+        it "can access Classes" do
           ClassDefinedInGroup.new
         end
-        it "can access CONSTANTS" do 
+        it "can access CONSTANTS" do
           CONSTANT_DEFINED_IN_GROUP
         end
-        it "can access methods" do 
+        it "can access methods" do
           method_defined_in_group
         end
       end
     end 
   end 
 end
-

data/features/before_and_after_blocks/before_and_after_blocks.feature

@@ -57,7 +57,7 @@ Feature: before and after blocks
         end
       end
       """
-  	When I run it with the spec script
+  	When I run it with the spec command
     Then the stdout should match "3 examples, 0 failures"
   
   Scenario: define before(:all) block in example group
@@ -89,7 +89,7 @@ Feature: before and after blocks
         end
       end
       """
-  	When I run it with the spec script
+  	When I run it with the spec command
     Then the stdout should match "3 examples, 0 failures"
   
   Scenario: define before and after blocks in configuration
@@ -125,7 +125,7 @@ Feature: before and after blocks
         end
       end
       """
-    When I run it with the spec script
+    When I run it with the spec command
     Then the stdout should match "3 examples, 0 failures"
 
   Scenario: before/after blocks are run in order
@@ -163,6 +163,6 @@ Feature: before and after blocks
       end
       """
 
-    When I run it with the spec script
+    When I run it with the spec command
     Then the stdout should match /before suite\nbefore all\nbefore each\nafter each\n\.after all\n.*after suite/m
 

data/features/example_groups/autogenerated_docstrings.feature

@@ -27,7 +27,7 @@ Feature: autogenerated docstrings
   Scenario: run passing examples with spec
     Given the file ../../examples/passing/autogenerated_docstrings_example.rb
 
-    When I run it with the spec script -fs
+    When I run it with the spec command -fs
 
     Then the stdout should match /should equal 5/
     And the stdout should match /should be < 5/
@@ -37,7 +37,7 @@ Feature: autogenerated docstrings
   Scenario: run failing examples with spec
     Given the file ../../examples/failing/failing_autogenerated_docstrings_example.rb
 
-    When I run it with the spec script -fs
+    When I run it with the spec command -fs
 
     Then the stdout should match /should equal 2/
     And the stdout should match /should be > 5/

data/features/example_groups/example_group_with_should_methods.feature

@@ -12,6 +12,6 @@ Feature: Spec::ExampleGroup with should methods
 
   Scenario: Run with spec
   Given the file ../../resources/spec/example_group_with_should_methods.rb
-    When I run it with the spec script
+    When I run it with the spec command
     Then the exit code should be 256
     And the stdout should match "2 examples, 1 failure"

data/features/example_groups/nested_groups.feature

@@ -12,6 +12,6 @@ Feature: Nested example groups
 
   Scenario: Run with spec
     Given the file ../../examples/passing/stack_spec_with_nested_example_groups.rb
-    When I run it with the spec script -fs
+    When I run it with the spec command -fs
     Then the stdout should match /Stack \(empty\)/
     And the stdout should match /Stack \(full\)/

data/features/interop/examples_and_tests_together.feature

@@ -20,7 +20,7 @@ Feature: Spec and test together
   Scenario: Run with spec
     Given the file ../../resources/test/spec_and_test_together.rb
 
-    When I run it with the spec script -fs
+    When I run it with the spec command -fs
 
     Then the exit code should be 256
     And the stdout should match "ATest"

data/features/interop/test_but_not_test_unit.feature

@@ -10,5 +10,5 @@ Story: Test is defined, but not Test::Unit
 
   Scenario: Run with spec
     Given the file ../../resources/test/spec_including_test_but_not_unit.rb
-    When I run it with the spec script
+    When I run it with the spec command
     Then the stderr should not match "Test::Unit"

data/features/interop/test_case_with_should_methods.feature

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