Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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
Commits on Jul 08, 2012
@dchelimsky dchelimsky loosen time constraint for be_within example 79febad
Commits on Jul 10, 2012
@dchelimsky dchelimsky enhance rdoc for expect syntax ebd8a4c
@dchelimsky dchelimsky tweak README (expect syntax) d5417f9
Commits on Jul 13, 2012
@myronmarston myronmarston Remove the hacky search for should_not in backtrace.
It wasn't working for the `expect { .. }.to` syntax, anyway.
9814ab2
@myronmarston myronmarston Loosen error message constraints for raise_error matcher specs.
This is in prep for #59--once I had some backtrace info, all of these would fail since they are doing exact string matches.
2c2fdb6
Commits on Jul 17, 2012
@alexcoplan alexcoplan add support for coloured diffs dbe5aa3
@alexcoplan alexcoplan fixed coloring, added tests for colored diff 54b9e98
@alexcoplan alexcoplan tests now stub color config, removed setter in config 505db9f
@alexcoplan alexcoplan no magic nums, yellow->green for insertions 477fac1
@alexcoplan alexcoplan fixed chr grabbing for older rb implementations 83cdba4
Commits on Jul 18, 2012
@myronmarston myronmarston Merge pull request #157 from alexcoplan/color_diffs
Colored Diffs
3b4f60c
@myronmarston myronmarston Update changelog. 067f13d
Commits on Jul 19, 2012
@dchelimsky dchelimsky move post-2.11.1 enhancements in changelog 024002c
Commits on Jul 25, 2012
@ggilder ggilder #159: Revise should(_not) to work with MacRuby 9c9619b
@myronmarston myronmarston Merge pull request #160 from ggilder/master
#159: Revise should(_not) to work with MacRuby
d51bf72
@myronmarston myronmarston Add change log entry for #160. 147f710
@alindeman alindeman Be defensive about resolving `Object`
It'd be pretty crazy for there to be an `RSpec::Object` or
`RSpec::Expectations::Object,` but 1) Ruby's constant resolution rules
have changed and I don't always remember them and 2) We were originally
defensive about it.
3cacdde
Commits on Jul 26, 2012
@myronmarston myronmarston Cherry-pick 2.11.2 release stuff from 2-11-maint branch. c897a47
Commits on Jul 27, 2012
@myronmarston myronmarston Ensure #== is defined on build in matchers so that they can be composed.
For example:

expect {
  user.emailed!
}.to change{user.last_emailed_at}.from(nil).to be_within(1.second).of(Time.zone.now)

Closes #161.
d427bac
Commits on Aug 25, 2012
@alexcoplan alexcoplan use same color config method as core 94fce05
@alexcoplan alexcoplan improve diff coloring code 248004e
@alexcoplan alexcoplan revert to using static color methods 7cdd88b
@myronmarston myronmarston Merge pull request #169 from alexcoplan/better_diff_coloring
Better diff coloring
f4d4cd0
Commits on Aug 26, 2012
@myronmarston myronmarston Run all specs together and in isolation for build.
We want them to be able to pass when run in isolation w/o bundler being loaded.
b0d5007
@myronmarston myronmarston Fix ruby warnings.
/Users/myron/code/rspec-dev/repos/rspec-expectations/lib/rspec/matchers/dsl.rb:8: warning: method redefined; discarding old ignore
/Users/myron/code/rspec-dev/repos/rspec-expectations/lib/rspec/matchers/dsl.rb:8: warning: previous definition of ignore was here
a8d9014
@myronmarston myronmarston Improve how we find the path to the rspec exe.
On travis, it found `/home/travis/builds/rspec/exe/rspec`,
and that didn't exist. I'm not sure why it didn't find the
one in rspec-core, but I think this'll fix it.
cafef45
@myronmarston myronmarston Revert recent build change -- it's not working on Travis CI.
I need to head to bed in a bit and I don't want to leave the build
broken. I'll put this in a branch and play with it there to
get it to work.

- Revert "Improve how we find the path to the rspec exe."
  This reverts commit cafef45.
- Revert "Run all specs together and in isolation for build."
  This reverts commit b0d5007.
aa4530d
Commits on Sep 05, 2012
@myronmarston myronmarston Fix and deprecate `expect { }.should` syntax.
Fixes #170.
b89b8c5
@myronmarston myronmarston Add missing changelog entry I forgot to add.
This was fixed in d427bac.
016aece
@myronmarston myronmarston Add 2.11.3 release info. cf6cf5d
Commits on Sep 06, 2012
@myronmarston myronmarston Fix full changelog URL. d5e6e36
Commits on Sep 08, 2012
@dchelimsky dchelimsky run should_clean gem (it "does ... v it "should ...) 3c0e7ea
Commits on Sep 10, 2012
@myronmarston myronmarston Fix and re-enable the test_all build.
I had previously attempted to add this in b0d5007 but find_path_to_rspec_exe wasn't quite right.

Travis installs rspec-core as a :git gem so the path is `.../rspec-core-<sha>/lib`, not `.../rspec-core/lib`.
46d5347
@myronmarston myronmarston Use stub_const rather than hand-rolled const mutation.
This also fixes a warning I was getting on the 1.8.7 build:

rspec-expectations/spec/rspec/matchers/have_spec.rb:13: warning: redefine pluralize
d0773b1
Commits on Sep 12, 2012
David Chelimsky whitespace 60a58ec
David Chelimsky update Gemfile-custom 66ad37c
David Chelimsky more custom Gemfile updates d3d8672
Commits on Sep 27, 2012
@samphippen samphippen Make the include matcher require the key to exist in the hash.
There was a weird case where {}.should include(:something => nil) would
pass, Myron suggested we make this not the case. Here's a patch that
does that

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
04eb38d
@myronmarston myronmarston Fix typo. cfaf6b5
Commits on Oct 01, 2012
@myronmarston myronmarston Allow rbx-19mode build to fail (for now).
We've been getting a strange failure on rbx-19 that I can't reproduce locally:

https://travis-ci.org/#!/rspec/rspec-expectations/jobs/2583529
8c7cc53
@alindeman alindeman Tests specifically for ability to use ::RSpec.configuration, not ::RS…
…pec::Core

* It is possible for RSpec::Core to be defined, but not be fully loaded
  enough for RSpec.configuration to be accessible because
  rspec-core.gemspec requires 'lib/rspec/core/version' which defines
  RSpec::Core::Version but nothing else.
e20978f
Commits on Oct 03, 2012
@alindeman alindeman Document inline code samples with backticks
* Hopefully prevents relishapp from considering the _ as italics
4c0dfd7
Commits on Oct 04, 2012
@alindeman alindeman Fixes the build on rbx
* rbx confusingly raises a NoMethodError in the error case described in
  `access_running_example.feature`. MRI and JRuby raise NameError.
  Because matching exactly isn't super-important, let's just match less
  stringently on the error message.
32a1feb
@myronmarston myronmarston Fixup documentation output of configuration specs. 1644904
Commits on Oct 09, 2012
@myronmarston myronmarston Include backtrace in errors reported by `raise_error` matcher.
It's hard to troubleshoot unexpected errors when the backtrace is silenced,
as it was previously.

Closes #59.
4a919ab