@@ -1,4 +1,5 @@ Autotest.add_hook :initialize do |at| + at.libs = 'lib:spec' at.clear_mappings .autotest @@ -4,8 +4,8 @@ require 'spec' module MyExtras protected - def include_words(string) - WordsInclusionMatcher.new(string) + def include_phrase(string) + PhraseMatcher.new(string) end def collection(params = {}) @@ -25,7 +25,7 @@ Spec::Runner.configure do |config| config.mock_with :mocha end -class WordsInclusionMatcher +class PhraseMatcher def initialize(string) @string = string @pattern = /\b#{string}\b/ @@ -37,10 +37,10 @@ class WordsInclusionMatcher end def failure_message - "expected #{@actual.inspect} to contain words #{@string.inspect}" + "expected #{@actual.inspect} to contain phrase #{@string.inspect}" end def negative_failure_message - "expected #{@actual.inspect} not to contain words #{@string.inspect}" + "expected #{@actual.inspect} not to contain phrase #{@string.inspect}" end end spec/spec_helper.rb @@ -43,13 +43,13 @@ describe WillPaginate::ViewHelpers::Base do end it "should display shortened end results" do - info(:page => 7, :per_page => 4).should include_words('strings 25 - 26') + info(:page => 7, :per_page => 4).should include_phrase('strings 25 - 26') end it "should handle longer class names" do collection = @array.paginate(:page => 2, :per_page => 5) collection.first.stubs(:class).returns(mock('Class', :name => 'ProjectType')) - info(collection).should include_words('project types') + info(collection).should include_phrase('project types') end it "should adjust output for single-page collections" do spec/view_helpers/base_spec.rb 89e850cdf4ab6a6547a2f4ead227ffd6838ffdc7 Mislav Marohnić mislav.marohnic@gmail.com http://github.com/mattetti/will_paginate/commit/f9ba6a08c97a74cc783bb02856758956e9e32411 f9ba6a08c97a74cc783bb02856758956e9e32411 2008-06-19T16:23:02-07:00 2008-06-19T16:23:02-07:00 specs: include_words -> include_phrase 5247716de2c00873d0f07eefbeaff5696c7da3c4 Mislav Marohnić mislav.marohnic@gmail.com