@@ -5,3 +5,4 @@ tmtags pkg doc email.txt +*.swp .gitignore @@ -22,7 +22,7 @@ module Spec "expected not to have text #{expected.inspect}" end - def to_s + def description "have text #{expected.inspect}" end lib/spec/rails/matchers/have_text.rb @@ -21,7 +21,7 @@ module Spec "expected not to include text #{expected.inspect}" end - def to_s + def description "include text #{expected.inspect}" end @@ -51,4 +51,4 @@ module Spec end end -end \ No newline at end of file +end lib/spec/rails/matchers/include_text.rb @@ -2,17 +2,25 @@ require File.dirname(__FILE__) + '/../../../spec_helper' describe "have_text" do + + it "should have a helpful description" do + matcher = have_text("foo bar") + matcher.description.should == 'have text "foo bar"' + end + describe "where target is a Regexp" do it 'should should match submitted text using a regexp' do - string = 'foo' - string.should have_text(/fo*/) + matcher = have_text(/fo*/) + matcher.matches?('foo').should be_true + matcher.matches?('bar').should be_nil end end describe "where target is a String" do it 'should match submitted text using a string' do - string = 'foo' - string.should have_text('foo') + matcher = have_text('foo') + matcher.matches?('foo').should be_true + matcher.matches?('foo bar').should be_false end end spec/spec/rails/matchers/have_text_spec.rb @@ -2,21 +2,19 @@ require File.dirname(__FILE__) + '/../../../spec_helper' describe "include_text" do - describe "where target is a String" do - it 'should match submitted text using a string' do - string = 'foo' - string.should include_text('foo') - end + it "should have a helpful description" do + matcher = include_text("foo bar") + matcher.description.should == 'include text "foo bar"' + end - it 'should match if the text is contained' do - string = 'I am a big piece of text' - string.should include_text('big piece') - end + it 'should match if the text is contained' do + matcher = include_text('big piece') + matcher.matches?('I am a big piece of text').should be_true + end - it 'should not match if text is not contained' do - string = 'I am a big piece of text' - string.should_not include_text('corey') - end + it 'should not match if text is not contained' do + matcher = include_text('foo bar') + matcher.matches?('hello world').should be_false end end spec/spec/rails/matchers/include_text_spec.rb 04cdabad87f78cbf1efb3265f1b5031aec3dad9d Ben Mabey ben@benmabey.com http://github.com/bmabey/rspec-rails/commit/4990cda9f01edd1dd9a714563ad22ce333d9c225 4990cda9f01edd1dd9a714563ad22ce333d9c225 2009-01-16T21:29:21-08:00 2009-01-16T21:29:21-08:00 adding #description to have_text and include_text [#656] 35f5aefc1470a892a45b337bbc0bf29cff527cb4 Ben Mabey ben@benmabey.com