rspec 0.6.3 → 0.6.4

data/test/spec/runner/formatter/failure_dump_test.rb

@@ -16,15 +16,15 @@ module Spec
         end
   
         def test_should_add_spacing_between_sections
-          error = Spec::Api::ExpectationNotMetError.new "message"
+          error = Spec::Expectations::ExpectationNotMetError.new "message"
           set_backtrace error
           @reporter.spec_finished "spec", error, "spec"
           @reporter.dump
-          assert_match(/\nF\n\n1\)\nSpec::Api::ExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
+          assert_match(/\nF\n\n1\)\nSpec::Expectations::ExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
         end
       
         def test_should_end_with_line_break
-          error = Spec::Api::ExpectationNotMetError.new "message"
+          error = Spec::Expectations::ExpectationNotMetError.new "message"
           set_backtrace error
           @reporter.spec_finished "spec", error, "spec"
           @reporter.dump
@@ -32,11 +32,11 @@ module Spec
         end
     
         def test_should_include_informational_header
-          error = Spec::Api::ExpectationNotMetError.new "message"
+          error = Spec::Expectations::ExpectationNotMetError.new "message"
           set_backtrace error
           @reporter.spec_finished "spec", error, "spec"
           @reporter.dump
-          assert_match(/^Spec::Api::ExpectationNotMetError in 'context spec'/, @io.string)
+          assert_match(/^Spec::Expectations::ExpectationNotMetError in 'context spec'/, @io.string)
         end
     
         def test_should_include_context_and_spec_name_in_backtrace_if_error_in_spec
@@ -81,11 +81,11 @@ module Spec
         end
 
         def test_spacing_between_sections
-          error = Spec::Api::ExpectationNotMetError.new "message"
+          error = Spec::Expectations::ExpectationNotMetError.new "message"
           set_backtrace error
           @reporter.spec_finished "spec", error, "spec"
           @reporter.dump
-          assert_match(/\ncontext\n- spec \(FAILED - 1\)\n\n1\)\nSpec::Api::ExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
+          assert_match(/\ncontext\n- spec \(FAILED - 1\)\n\n1\)\nSpec::Expectations::ExpectationNotMetError in 'context spec'\nmessage\n\/a\/b\/c\/d\/e.rb:34:in `spec'\n\nFinished in /, @io.string)
         end
       
       end

data/test/spec/runner/option_parser_test.rb

@@ -116,6 +116,26 @@ module Spec
         options = OptionParser.parse(["-s","something or other"], false, @err, @out)
         assert_equal "something or other", options.spec_name
       end
+
+      def test_should_not_use_colour_by_default
+        options = OptionParser.parse([], false, @err, @out)
+        assert !options.colour
+      end
+
+      def test_should_support_queens_colour_option
+        options = OptionParser.parse(["--colour"], false, @err, @out)
+        assert options.colour
+      end
+
+      def test_should_support_us_color_option
+        options = OptionParser.parse(["--color"], false, @err, @out)
+        assert options.colour
+      end
+
+      def test_should_support_c_option
+        options = OptionParser.parse(["-c"], false, @err, @out)
+        assert options.colour
+      end
     end
   end
 end

data/test/spec/runner/reporter_test.rb

@@ -6,8 +6,8 @@ module Spec
       
       def setup
         @io = StringIO.new
-        @backtrace_tweaker = Spec::Api::Mock.new("backtrace tweaker")
-        @formatter = Spec::Api::Mock.new("formatter")
+        @backtrace_tweaker = Spec::Mocks::Mock.new("backtrace tweaker")
+        @formatter = Spec::Mocks::Mock.new("formatter")
         @reporter = Reporter.new(@formatter, @backtrace_tweaker)
       end
 
@@ -120,7 +120,7 @@ module Spec
       end
 
       def failure
-        Api::DuckTypeArgConstraint.new(:header, :message, :backtrace)
+        Mocks::DuckTypeArgConstraint.new(:header, :message, :backtrace)
       end
 
     end

data/test/spec/runner/specification_test.rb

@@ -4,7 +4,7 @@ module Spec
     class SpecificationTest < Test::Unit::TestCase
       
       def setup
-        @reporter = Api::Mock.new "reporter"
+        @reporter = Spec::Mocks::Mock.new "reporter"
       end
 
       def test_should_run_spec_in_scope_of_execution_context
@@ -47,11 +47,11 @@ module Spec
         @reporter.should_receive(:spec_started).with "spec"
         @reporter.should_receive(:spec_finished) do |spec_name, error|
           spec_name.should_equal "spec"
-          error.message.should_match /expected 'poke' once, but received it 0 times/
+          error.message.should_match(/expected 'poke' once, but received it 0 times/)
         end
         spec.run @reporter
       end
-      
+
       def test_should_run_teardown_even_when_main_block_fails
         spec = Specification.new("spec") do
           raise "in body"

data/test/spec/test_to_spec/sexp_transformer_assertion_test.rb

@@ -111,13 +111,13 @@ module Spec
       end
 
       def test_assert_match
-        assert_match /foo/, 'foo'
-        'foo'.should_match /foo/
+        assert_match(/foo/, 'foo')
+        'foo'.should_match(/foo/)
       end
 
       def test_assert_no_match
-        assert_no_match /foo/, 'bar'
-        'bar'.should_not_match /foo/
+        assert_no_match(/foo/, 'bar')
+        'bar'.should_not_match(/foo/)
       end
 
       def test_assert_respond_to

data/test/spec/test_to_spec/sexp_transformer_test.rb

@@ -23,7 +23,7 @@ module Spec
     class SecondTest < Test::Unit::TestCase
       def test_foo
         assert_same 3, 1+2
-        assert_match /sla/, 'aslak'
+        assert_match(/sla/, 'aslak')
       end
     end
     class SecondContext

data/test/spec/test_to_spec/testfiles/test_unit_api_test.rb

@@ -29,9 +29,9 @@ class TestUnitApiTest < Test::Unit::TestCase
     assert_in_delta       123.5, a_float, 0.1, "a message"
     assert_instance_of    Fixnum, @an_int, "a message"
     assert_kind_of        Numeric, @an_int, "a message"
-    assert_match     /789/  , @an_int.to_s
+    assert_match(/789/  , @an_int.to_s)
     assert_nil a_nil
-    assert_no_match       /7890/, @an_int.to_s, "a message"
+    assert_no_match(/7890/, @an_int.to_s, "a message")
     assert_not_equal 780,      @an_int
     assert_not_nil        @an_int, "a message"
     assert_not_same       @an_int, a_float, "a message"

data/test/test_classes.rb

@@ -2,7 +2,7 @@
 # They are kept in a separate file so that they can also
 # be accessed by the test2spec-translated specs
 module Spec
-  module Api
+  module Expectations
     class Person
       attr_reader :name
       def initialize name
@@ -46,6 +46,12 @@ module Spec
         def add_to_collection_with_length_method(item)
           @items_in_collection_with_length_method.push(item)
         end
+        
+        def items_for(arg)
+          return [1, 2, 3] if arg == 'a'
+          [1]
+        end
+        
       end
 
       class HandCodedMock
@@ -66,11 +72,25 @@ module Spec
           @funny_called = true
           @return_val
         end
+        
+        def exists?
+          @return_val
+        end
+        
+        def multi_word_predicate?
+          @return_val
+        end
 
         def __verify
           @funny_called.should_be true
         end
       end
+      class ClassWithUnqueriedPredicate
+        attr_accessor :foo
+        def initialize(foo)
+          @foo = foo
+        end
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -5,7 +5,7 @@ $LOAD_PATH.push File.dirname(__FILE__) + '/../test'
 require 'spec'
 require 'test_classes'
 RSPEC_TESTING = true unless defined? RSPEC_TESTING # This causes the diff extension to not be loaded
-require 'spec/api/helper/diff'
+require 'spec/expectations/diff'
 $context_runner = ::Spec::Runner::OptionParser.create_context_runner(['test'], false, STDERR, STDOUT)
 
 # helpers for test_to_spec tests

data/vendor/selenium/README.txt

@@ -0,0 +1,23 @@
+= Using Selenium with RSpec =
+(Also see ../watir/README.txt)
+
+The files in this directory are examples illustrating how to use Selenium
+from RSpec. In addition to Ruby and RSpec you need:
+
+* Install Java 1.4 or later
+* Download SeleniumRC 0.8.1 or later (http://www.openqa.org/selenium-rc/)
+* Copy selenium-server.jar into this directory.
+* Copy selenium.rb into this directory.
+
+After this is installed, open two shells.
+
+In the first one, run:
+
+  java -jar selenium-server.jar
+
+In the second one, run:
+
+  ruby find_rspecs_home_page.rb --format specdoc
+  
+NOTE
+If you want to optimize speed (by sacrificing spec independence) you may apply the patch start_browser_once.patch

data/vendor/selenium/find_rspecs_home_page.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/rspec_selenium'
+
+context "Google's search page" do
+
+  setup do
+    @browser = Selenium::SeleneseInterpreter.new("localhost", 4444, "*firefox", "http://www.google.no", 10000)
+    @browser.start
+    @browser.open('http://www.google.no')
+  end
+
+  specify "should find rspec's home page when I search for rspec" do
+    @browser.type "name=q", "rspec"
+    @browser.click_and_wait "name=btnG"
+    @browser.is_text_present("rspec.rubyforge.org").should_be(true)
+  end
+
+  specify "should not find Ali G when I search for rspec" do
+    @browser.type "name=q", "rspec"
+    @browser.click_and_wait "name=btnG"
+    @browser.is_text_present("Ali G").should_be(false)
+  end
+
+end

data/vendor/selenium/rspec_selenium.rb

@@ -0,0 +1,33 @@
+require 'rubygems'
+require 'spec'
+require File.dirname(__FILE__) + '/selenium'
+
+class RSpecSelenium
+  def teardown
+    @browser.stop
+  end
+end
+
+module Spec
+  module Runner
+    class Context
+      def before_context_eval
+        inherit RSpecSelenium
+      end
+    end
+  end
+end
+
+module Selenium
+  class SeleneseInterpreter
+    def click_and_wait(locator, timeout="5000")
+      click(locator)
+      wait_for_page_to_load timeout
+    end
+
+    def open_and_wait(url, timeout="5000")
+      open(url)
+      wait_for_page_to_load timeout
+    end
+  end
+end

data/vendor/watir/README.txt

@@ -0,0 +1,32 @@
+= Using Watir with RSpec =
+
+Watir provides a Ruby API to talk to a browser (Internet Explorer).
+Many people use Watir to *test* web applications, but it is also excellent
+for *specifying* the *intended behaviour* of a web application. Even
+for web applications that don't yet exist!
+
+Customers, QA people, testers and programmers can translate user story
+acceptance criteria to executable specs based on RSpec and Watir. Take
+a look at find_rspecs_home_page.txt (the story) with find_rspecs_home_page.rb
+(the associated spec).
+
+One of the great benefits of using Watir with RSpec as opposed to using
+Watir 'alone' or Watir with Test::Unit is RSpec's specdoc feature, which
+is a great way to see what behaviour is actually implemented and in a working
+condition. It also makes the behaviour of your webapp more transparent to
+customers. They can say "The specdoc says foo, but I meant bar. We need to talk".
+
+This directory contains a simple example to illustrate this. After you
+have installed Ruby, Watir and RSpec, open a shell, go to this directory
+and type:
+
+  ruby find_rspecs_home_page.rb --format specdoc
+
+Or better:
+
+  ruby find_rspecs_home_page.rb --format html > find_rspecs_home_page.html
+
+And upload find_rspecs_home_page.html to your project's web page or intranet.
+This will give immediate visibility to the intended behaviour of your web app,
+as well as whether it's working as expected or not.
+

data/vendor/watir/find_rspecs_home_page.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/rspec_watir'
+
+context "Google's search page" do
+
+  setup do
+    @browser.goto('http://www.google.com')
+  end
+
+  specify "should find rspec's home page when I search for rspec" do
+    @browser.text_field(:name, "q").set("rspec")
+    @browser.button(:name, "btnG").click
+    @browser.should_contain("rspec.rubyforge.org") # should_contain_text is RSpec sugar
+  end
+
+  specify "should not find Ali G when I search for rspec" do
+    @browser.text_field(:name, "q").set("rspec")
+    @browser.button(:name, "btnG").click
+    @browser.should_not_contain("Ali G")
+  end
+
+end

data/vendor/watir/find_rspecs_home_page.txt

@@ -0,0 +1,15 @@
+= Find RSpec's home page =
+
+As an agile customer
+I want to easily find RSpec's home page
+So that I can learn about this fantastic tool
+
+I will know that we are done when:
+ 
+Given I am on Google's search page
+When I search for 'rspec'
+Then http://rspec.rubyforge.org/ should be the top result
+ 
+Given I am on Google's search page
+When I search for 'rspec'
+Then Ali G (who says respec a lot) is not among the results

data/vendor/watir/rspec_watir.rb

@@ -0,0 +1,45 @@
+require 'rubygems'
+require 'spec'
+require 'watir'
+
+# Comment out to enable ActiveRecord fixtures
+#require 'active_record'
+#require 'active_record/fixtures'
+#config = YAML::load_file(File.dirname(__FILE__) + '/database.yml')
+#$fixture_path = File.dirname(__FILE__) + '/fixtures'
+#ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+#ActiveRecord::Base.establish_connection(config['db'])
+
+class RSpecWatir
+  def setup
+    #Fixtures.create_fixtures($fixture_path, @@fixtures)
+    @browser = Watir::IE.new
+  end
+
+  def teardown
+    @browser.close
+  end
+  
+  #def self.fixtures(*testdata)
+  #  @@fixtures = testdata
+  #end
+end
+
+module Spec
+  module Runner
+    class Context
+      def before_context_eval
+        inherit RSpecWatir
+      end
+    end
+  end
+end
+
+# Extensions to Watir to make it play nicer with RSpec
+module Watir
+  class IE
+    # @browser.should_contain("bla bla")
+    # @browser.should_not_contain("bla bla")
+    alias_method :contain?, :contains_text
+  end
+end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
-date: 2006-08-29 00:00:00 +02:00
-summary: RSpec-0.6.3 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.6.4
+date: 2006-10-01 00:00:00 -05:00
+summary: RSpec-0.6.4 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Steven Baker, Aslak Hellesoy, Dave Astels, David Chelimsky
 files: 
@@ -33,22 +34,24 @@ files:
 - Rakefile
 - README
 - lib/spec.rb
-- lib/spec/api.rb
+- lib/spec/expectations.rb
+- lib/spec/mocks.rb
 - lib/spec/runner.rb
 - lib/spec/version.rb
-- lib/spec/api/exceptions.rb
-- lib/spec/api/expectations.rb
-- lib/spec/api/helper.rb
-- lib/spec/api/sugar.rb
-- lib/spec/api/helper/diff.rb
-- lib/spec/api/helper/have_helper.rb
-- lib/spec/api/helper/should_base.rb
-- lib/spec/api/helper/should_helper.rb
-- lib/spec/api/helper/should_negator.rb
-- lib/spec/api/mocks/argument_expectation.rb
-- lib/spec/api/mocks/message_expectation.rb
-- lib/spec/api/mocks/mock.rb
-- lib/spec/api/mocks/order_group.rb
+- lib/spec/expectations/diff.rb
+- lib/spec/expectations/exceptions.rb
+- lib/spec/expectations/expectations.rb
+- lib/spec/expectations/have_helper.rb
+- lib/spec/expectations/helper.rb
+- lib/spec/expectations/should_base.rb
+- lib/spec/expectations/should_helper.rb
+- lib/spec/expectations/should_negator.rb
+- lib/spec/expectations/sugar.rb
+- lib/spec/mocks/argument_expectation.rb
+- lib/spec/mocks/exceptions.rb
+- lib/spec/mocks/message_expectation.rb
+- lib/spec/mocks/mock.rb
+- lib/spec/mocks/order_group.rb
 - lib/spec/rake/rcov_verify.rb
 - lib/spec/rake/spectask.rb
 - lib/spec/runner/backtrace_tweaker.rb
@@ -74,24 +77,26 @@ files:
 - lib/spec/test_to_spec/translation_test_runner.rb
 - test/test_classes.rb
 - test/test_helper.rb
-- test/spec/api/sugar_test.rb
-- test/spec/api/helper/arbitrary_predicate_test.rb
-- test/spec/api/helper/containment_test.rb
-- test/spec/api/helper/diff_test.rb
-- test/spec/api/helper/identity_test.rb
-- test/spec/api/helper/object_equality_test.rb
-- test/spec/api/helper/raising_test.rb
-- test/spec/api/helper/regex_matching_test.rb
-- test/spec/api/helper/should_have_test.rb
-- test/spec/api/helper/should_satisfy_test.rb
-- test/spec/api/helper/throwing_test.rb
-- test/spec/api/helper/true_false_special_case_test.rb
-- test/spec/api/helper/typing_test.rb
-- test/spec/api/mocks/mock_arg_constraints_test.rb
-- test/spec/api/mocks/mock_counts_test.rb
-- test/spec/api/mocks/mock_ordering_test.rb
-- test/spec/api/mocks/mock_test.rb
-- test/spec/api/mocks/null_object_test.rb
+- test/spec/expectations/arbitrary_operator_test.rb
+- test/spec/expectations/arbitrary_predicate_test.rb
+- test/spec/expectations/containment_test.rb
+- test/spec/expectations/diff_test.rb
+- test/spec/expectations/identity_test.rb
+- test/spec/expectations/object_equality_test.rb
+- test/spec/expectations/raising_test.rb
+- test/spec/expectations/regex_matching_test.rb
+- test/spec/expectations/should_have_test.rb
+- test/spec/expectations/should_satisfy_test.rb
+- test/spec/expectations/sugar_test.rb
+- test/spec/expectations/supported_symbols_test.rb
+- test/spec/expectations/throwing_test.rb
+- test/spec/expectations/true_false_special_case_test.rb
+- test/spec/expectations/typing_test.rb
+- test/spec/mocks/mock_arg_constraints_test.rb
+- test/spec/mocks/mock_counts_test.rb
+- test/spec/mocks/mock_ordering_test.rb
+- test/spec/mocks/mock_test.rb
+- test/spec/mocks/null_object_test.rb
 - test/spec/runner/backtrace_tweaker_test.rb
 - test/spec/runner/context_matching_test.rb
 - test/spec/runner/context_runner_test.rb
@@ -113,19 +118,25 @@ files:
 - test/spec/test_to_spec/test_case_ext_test.rb
 - test/spec/test_to_spec/testfiles/test_unit_api_spec.rb
 - test/spec/test_to_spec/testfiles/test_unit_api_test.rb
-- examples/airport_spec.rb
-- examples/bdd_framework_spec.rb
 - examples/custom_formatter.rb
-- examples/custom_method_spec.rb
 - examples/file_accessor.rb
 - examples/file_accessor_spec.rb
+- examples/helper_method_spec.rb
 - examples/io_processor.rb
 - examples/io_processor_spec.rb
-- examples/mocking_spec.rb
+- examples/mocking_example.rb
+- examples/predicate_example.rb
 - examples/stack.rb
 - examples/stack_spec.rb
-- examples/sugar_spec.rb
+- examples/stubbing_example.rb
 - examples/test_case_spec.rb
+- vendor/watir/find_rspecs_home_page.rb
+- vendor/watir/rspec_watir.rb
+- vendor/watir/find_rspecs_home_page.txt
+- vendor/watir/README.txt
+- vendor/selenium/find_rspecs_home_page.rb
+- vendor/selenium/rspec_selenium.rb
+- vendor/selenium/README.txt
 test_files: []
 
 rdoc_options: