Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rspec/rspec-expectations
...
head fork: rspec/rspec-expectations
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Aug 31, 2010
@justinko justinko equality.feature
- Closes #15.
7b52164
@dchelimsky dchelimsky beef up equality matchers feature 7cdb347
Commits on Sep 04, 2010
@dchelimsky dchelimsky delegate be(val) to equal(val) deb38c9
@dchelimsky dchelimsky un-pend pending example
- was failing on ruby-1.9.2-preview, but passes now on ruby-1.9.2 final
8f740ac
@myronmarston myronmarston Remove dependency on jeweler.
- Allows us to have an always-up-to-date gemspec.
- Use bundler's build/install/release rake tasks rather than jeweler's.
- One less development dependency.
- No need for a separate VERSION file.
15060b8
@dchelimsky dchelimsky add ruby-debug to Gemfile 04eeba1
@dchelimsky dchelimsky Make eq and eql matchers diffable and clean up when to/not diff e7303e9
@dchelimsky dchelimsky Diff when comparing a multiline string to a regexp
- Closes #8.
76434fa
Commits on Sep 08, 2010
@dchelimsky dchelimsky remove ruby-debug from Gemfile for 1.9.1 b43f107
@dchelimsky dchelimsky remove unnecessary requirement from feature
- output of paths changed subtly and caused this feature to fail
  unnecessarily. No need to bind this feature to that part of the
  output.
ed7e32a
Commits on Sep 09, 2010
@dchelimsky dchelimsky should[_not] change now handles boolean values correctly
- Closes #16.
ecd24f5
@dchelimsky dchelimsky clean up the change matcher c249173
Commits on Sep 11, 2010
@dchelimsky dchelimsky add beginnings of History f859a68
@dchelimsky dchelimsky history 6c31cbf
@dchelimsky dchelimsky fix changelog link in History f5aac62
Commits on Sep 12, 2010
@dchelimsky dchelimsky prep for beta.21 c4e6875
@dchelimsky dchelimsky bump version to 2.0.0.beta.21 76b9667
@dchelimsky dchelimsky stop using the old shared example API d13d9b7
Commits on Sep 13, 2010
@dchelimsky dchelimsky adjust history for beta.22 release 51f64b1
@dchelimsky dchelimsky bump version to 2.0.0.beta.22 311ba91
Commits on Sep 23, 2010
@ignu ignu fix for change by(0) bug
- Closes #17.
fa4446d
@dchelimsky dchelimsky extract method to remove tmp var 63c472f
@graaff graaff Explicitly require rspec version to fix broken rdoc task. d1653d7
Commits on Sep 27, 2010
@dchelimsky dchelimsky Add description to satisfy matcher.
- Closes #20.
878d865
@dchelimsky dchelimsky update history de19d98
Commits on Oct 02, 2010
@txus txus Include Matchers in MiniTest and TestUnit
- Closes #19.
78605a8
@dchelimsky dchelimsky update history b3faf00
Commits on Oct 03, 2010
@myronmarston myronmarston Added a cuke for predicate matchers. a0fb168
@myronmarston myronmarston Setup rcov. 8457ee8
@myronmarston myronmarston Fixed scenario so that it actually runs and passes.
It was labeled "Scenario Outline", which prevents cucumber from actually running it.  And one of the steps wasn't quite right.
9a4a56f
@myronmarston myronmarston Fix description of cuke feature. fb7978f
@myronmarston myronmarston Add scenarios for have_xxx (mapped to has_xxx?) predicate matchers. d8e2772
@myronmarston myronmarston Add cukes for have matchers.
- have(x).items
- have_exactly(x).items
- have_at_least(x).items
- have_at_most(x).items
c7e3fd5
@myronmarston myronmarston Fixed typo (it's "Array", not "Arrray"). 9e954bc
@myronmarston myronmarston Improved predicate matchers cuke.
- Use implicit subjects and no doc string.  The doc strings were just noise in these contrived examples.
- Added general discussion of predicate matcher rationale and functionality.
- Added scenario demonstrating passing of arguments from matcher to predicate method.
1f11463
@myronmarston myronmarston Add discussion to have matcher cuke. 11d29ba
@dchelimsky dchelimsky Merge remote branch 'myronmarston/matcher_cukes' c4085b2
Commits on Oct 04, 2010
@myronmarston myronmarston Added operator matchers cuke. c070382
@myronmarston myronmarston Fixed operator matchers cuke for ruby 1.9.
- The backtrace is a bit different for 1.9, so we have to check the output for each failure separately rather than all in one step.
- should_not is not supported for the =~ array matcher, so don't use it.
9bb3024
@dchelimsky dchelimsky Merge remote branch 'myronmarston/matcher_cukes' dd9e877
Commits on Oct 05, 2010
@myronmarston myronmarston Add cuke demonstrating usage of rspec-expectations with Test::Unit. 09d3e4c
@dchelimsky dchelimsky Regexp.compile ed4defb
@dchelimsky dchelimsky update history add3597
@dchelimsky dchelimsky bump version to 2.0.0.rc b1a6c84
Commits on Oct 07, 2010
@myronmarston myronmarston Fix respond_to matcher.
- Object.new.should_not respond_to(:object_id, :some_undefined_method)
  should fail (but passed before).
- Refactored and DRYed up the matcher a bit.
- Added argument arity info to failure_message_for_should_not.
- Added test coverage for more should_not cases.
- Closes #26.
64f9e9a
@dchelimsky dchelimsky history 6967fd6
Commits on Oct 09, 2010
@myronmarston myronmarston Add filtering for self-spec suite. 7624c93
@myronmarston myronmarston Add support for a DSL-defined matcher to define match logic for should
and should_not.
cd5c8cf
@myronmarston myronmarston Fixed the include matcher.
- Make it properly fail for the should_not case when given multiple values.
- Reorganized specs and added missing coverage.
- Added include matcher cuke.
ca24fa3
@dchelimsky dchelimsky history 0d69b6f
@myronmarston myronmarston Delegate Matcher#define_method to its singleton class.
This allows you to define helper methods in a matcher using #define_method to gain access to the parameters.

- Closes #29.
8ece37a
@dchelimsky dchelimsky words 2d32de6
Commits on Oct 10, 2010
@dchelimsky dchelimsky words 6d1692e
@dchelimsky dchelimsky add a little relish 22d41fb
@dchelimsky dchelimsky rename feature 08265c8
@dchelimsky dchelimsky words e6979bc
@dchelimsky dchelimsky words 65b077f
@dchelimsky dchelimsky words 8669852
@dchelimsky dchelimsky prep for 2.0.0 f532c20
@dchelimsky dchelimsky only run rcov when asked (default tasks don't) b44b3ad
@dchelimsky dchelimsky update rake tasks 6dffc93
Commits on Oct 16, 2010
@myronmarston myronmarston Port RSpec.deprecate from rspec-core.
It's already being used, and rspec-expectations should be usable without rspec-core.
451de05
@myronmarston myronmarston Add be_within(delta).of(expected) matcher
- Delegate be_close(expected, delta) to be_within
- Deprecate be_close(expected, delta)
- Reads much better.
- The argument ordering is clearer.
- Closes #32.
7852dbd
@myronmarston myronmarston Add cuke for be_kind_of and be_instance_of matchers.
- Closes #31.
83d28b2
@dchelimsky dchelimsky words 770ab8c
Commits on Oct 18, 2010
@dchelimsky dchelimsky update version and dependency versions 6d76c29
Commits on Oct 20, 2010
@myronmarston myronmarston Fix a few grammar/punctuation mistakes.
- Closes #34.
e5184c9
@dchelimsky dchelimsky rename feature e91c61e
@myronmarston myronmarston Add cuke for satisfy matcher. 8af9e08
Commits on Oct 21, 2010
@dchelimsky dchelimsky comment / TODO 98f61d9
Commits on Oct 22, 2010
@dchelimsky dchelimsky update dependencies across development repos 7032c39
Commits on Oct 23, 2010
@dchelimsky dchelimsky links to docs b8e248b
@myronmarston myronmarston Add cuke for exist matcher.
- Closes #39.
4a27f1f
@myronmarston myronmarston Fix matcher chaining to prevent name collisions.
Previously, #chain used #define_method on the class to define an instance method on all instances.  We want it to define the method on only this instance, so we need to delegate to the singleton class instead (which the recently added #define_method does for us!).

- Closes #38.
9fca9ea
@myronmarston myronmarston Fix `expect { ... }.to` so that it has no dependency on rspec-core an…
…d can work outside of it.
d3a6981
@dchelimsky dchelimsky update for relish c9a3033
Commits on Nov 06, 2010
@myronmarston myronmarston Raise an error if should/should_not !=/!~ is used since these operato…
…rs cannot be supported on ruby 1.8.

- Closes #33.
2d1a145
@txus txus have_matcher - use pluralize only when ActiveSupport inflections are …
…indeed defined

- Closes #30.
cfc20db
@myronmarston myronmarston Fix throw_symbol matcher so that it no longer swallows exceptions tha…
…t occur in the proc.
6cde7f6
@myronmarston myronmarston Improve failure messages for throw_symbol matcher and add a cuke for it.
- Closes #36.
584f3f6
Commits on Nov 07, 2010
@dchelimsky dchelimsky clean up load paths in spec helper 868c3ef
@dchelimsky dchelimsky eliminate some warnings f9ff542
@myronmarston myronmarston Fix infinite recursion SystemStackError on 1.9.2.
RSpec::Matchers#method_missing calls super, and it was supering to itself infinitely because RSpec::Matchers was being included multiple times.  rspec-core now takes care of including RSpec::Matchers on its as of this commit:

rspec/rspec-core@eefc972

- Closes #40.
44909b0
@dchelimsky dchelimsky history acbfcbe
@dchelimsky dchelimsky bump to 2.1.0 a1ef6b7
@dchelimsky dchelimsky update versions for development 8729e9a
Commits on Nov 15, 2010
@dchelimsky dchelimsky simplify feature 2b7b0d8
Commits on Nov 18, 2010
@dchelimsky dchelimsky tweak (c) a2c77f9
Commits on Nov 22, 2010
@myronmarston myronmarston Add match matcher cuke. 50a3e1c
@myronmarston myronmarston Add be matcher cuke. a553cfc
@myronmarston myronmarston Remove cuke references to "should be ==" and "should be ===".
should == and should === work just as well.
831403a
Commits on Nov 25, 2010
@dchelimsky dchelimsky method_missing is private 9571f5c
@dchelimsky dchelimsky explain README links to documentation d1423b8
@dchelimsky dchelimsky what the last commit said 9344c86
@dchelimsky dchelimsky same for rdoc 3d216cc
@dchelimsky dchelimsky upgrade to cucumber 0.9.4 56bc65f
Commits on Nov 28, 2010
@dchelimsky dchelimsky prep for 2.2 release 16ca752
@dchelimsky dchelimsky bump version to 2.2 5ec714a