Skip to content

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.
...
Commits on Oct 16, 2012
@samuil samuil Added count expectations to yield_control matcher 0619622
Commits on Feb 28, 2013
@vfrride vfrride Uses secure RubyGems URL 22cc254
@myronmarston myronmarston Merge pull request #216 from vfrride/patch-1
Uses secure RubyGems URL
44d85eb
Commits on Mar 04, 2013
@myronmarston myronmarston Use `double` rather than `mock`/`stub`.
Since we've deprecated mock/stub as aliases for `double` in rspec-mocks.
7194b33
Commits on Mar 11, 2013
@myronmarston myronmarston Merge pull request #217 from samuil/master
yield_control matchers could allow to define yields count
0490bb3
@myronmarston myronmarston Add changelog entry for #217.
[ci skip]
585dddb
@myronmarston myronmarston A few improvements to yield count matchers.
- Add `once` to fluent interface.
- Include the count description in failure message if it was specified as `once`.
- Use the "at most"/"at least" wording to correspond to the methods.
01fa642
@myronmarston myronmarston Fix cuke failure messages to align with my changes in 01fa642. 1388883
Commits on Mar 12, 2013
@myronmarston myronmarston Fix travis CI build.
- Bundler 1.3 needs rbconfig to be required to run `bin/rspec` after
  installing with `--standalone --binstubs`.
  bundler/bundler#2382
- The Travis VMs no longer have 32-bit JVMs available. Aruba 0.4.11
  forced the -d32 flag. 0.5 just documents it and makes a file available
  to require that will set it. We've updated Aruba here so that the jruby
  ENV vars aren't set automatically; we've kept the flag to disable JIT
  but removed -d32.
a68dfdc
Commits on Mar 13, 2013
@JonRowe JonRowe Fix an issue with using ascii encoding internally
Also this describes some of the expected behaviour for differently
encoded strings.
474bea3
Commits on Mar 14, 2013
@JonRowe JonRowe change to splitting directly on string da0ea8a
@JonRowe JonRowe add an encoding notice for this file, might fix the travis build issu…
…e (linux)
88348d5
@JonRowe JonRowe matching formatting to convention 71d51e1
@JonRowe JonRowe attempt 2 at fixing travis cbe881d
@gautamkpai gautamkpai Update README to use expect syntax. 9e03395
@JonRowe JonRowe fix encoding regression caused by shadowing variables and some typos a9d825f
@brunocoelho brunocoelho Add money class to README. d032019
@myronmarston myronmarston Merge pull request #221 from gautamkpai/update_readme
Update README to use expect syntax.
32740b5
@myronmarston myronmarston Merge pull request #222 from brunocoelho/add-money-class-to-readme
Add money class to README.
9679d6e
@JonRowe JonRowe handle compatibility errors and increase test coverage bd9a7bf
Commits on Mar 15, 2013
@gautamkpai gautamkpai Update yard docs to use expect syntax 324d27b
@gautamkpai gautamkpai Tweak documentaion to read better. 60c4d10
Commits on Mar 16, 2013
@myronmarston myronmarston Merge pull request #223 from gautamkpai/update_docs
Update yard docs to use expect syntax
1a2de54
@myronmarston myronmarston Merge pull request #220 from JonRowe/fix_internal_encoding_error
Encode diff literals according to the actual output encoding.
4131bb6
@myronmarston myronmarston Changelog entry for #220.
[ci skip]
cf84fea
Commits on Mar 17, 2013
@gautamkpai gautamkpai Update to use expect syntax. 1e6e76d
@myronmarston myronmarston Merge pull request #224 from gautamkpai/update_docs
Update to use expect syntax.
138e8ad
Commits on Mar 21, 2013
@JonRowe JonRowe whitespace cleanup bd2afb3
Commits on Mar 22, 2013
@myronmarston myronmarston Merge pull request #226 from JonRowe/whitespace_cleanup
Whitespace Cleanup
82f05dd
Commits on Mar 27, 2013
@samphippen samphippen Make expect(a).to be_within(x).percent_of(y) work with integer x and y
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
4b0a77e
@samphippen samphippen Add changelog entry for integer be_within percent fix.
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
e717002
@samphippen samphippen Fix a backtrace cleaning related spec.
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
055d706
@samphippen samphippen Change the differ for arrays of strings with newlines in them.
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
d72a1d7
Commits on Mar 28, 2013
@myronmarston myronmarston Merge pull request #229 from samphippen/percent-matcher-with-integers
Make the expect(a).to be_within(x).percent_of(y) matcher work with integer x and y
f12680c
@myronmarston myronmarston Merge pull request #228 from samphippen/fix-specs-for-backtrace-cleaner
Fix a backtrace cleaning related spec.
453999e
@myronmarston myronmarston Increase the aruba timeout for JRuby.
We've been getting intermittent aruba timeouts on JRuby.
222c367
@myronmarston myronmarston Stop using deprecated rspec-mocks APIs. 16f3de3
@samphippen samphippen Add a changelog entry for the new array differ.
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
e0d885c
@myronmarston myronmarston Merge pull request #213 from samphippen/differ-newlines
Change the differ for arrays of strings with newlines in them.
b3899f1
Commits on Apr 10, 2013
@samphippen samphippen Fixes some weird travis failures noted on master and in #236
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
ba482a5
Commits on Apr 11, 2013
@mrkn mrkn Fix have matcher for Enumerator on Ruby 2.0.0 46f08ad
@JonRowe JonRowe force diff-lcs 122 and remove workaround f2b15a3
@JonRowe JonRowe encoding diff now works thanks to diff-lcs 122 ebf6b96
@JonRowe JonRowe @samphippens workaround for no data being present changes the output …
…diffs
1c6b10d
@JonRowe JonRowe pend specs with older versions of diff lcs 11cc974
@JonRowe JonRowe Revert "force diff-lcs 122 and remove workaround"
This reverts commit f2b15a3.
e6c6a44
@gautamkpai gautamkpai Move all `should` related docs to its own page. b28f325
@gautamkpai gautamkpai Update docs to use expect syntax. 9276ee1
@gautamkpai gautamkpai Tweak documentation to read better. f1a6a29
Commits on Apr 12, 2013
@myronmarston myronmarston Merge pull request #225 from gautamkpai/should
Move `should` related stuff to separate page & update docs to use `expect`
9b7b579
@JonRowe JonRowe Update to diff-lcs 1.2.3 and remove workarounds.
This also corrects the previous diff's back the way they were and fixes
2f9dea2
@JonRowe JonRowe ws removal e785ad9
@JonRowe JonRowe Merge pull request #241 from JonRowe/whitespace-tidy
Whitespace Removal
0934b6f
@JonRowe JonRowe tweak readme for should 356c321
@JonRowe JonRowe Merge pull request #239 from JonRowe/upgrade_to_diff_lcs_122
Upgrade to diff-lcs 1.2.3
6ae72a6
@myronmarston myronmarston Merge pull request #240 from JonRowe/readme_tweak
Tweak the README slightly for better hints about `should`
1369522
@myronmarston myronmarston Merge pull request #218 from mrkn/fix_have_matcher_for_200
Fix have matcher for Enumerator on Ruby 2.0.0
0e5143d
@myronmarston myronmarston Add changelog entry for #218.
[ci skip]
20e3f24
Commits on Apr 15, 2013
@samphippen samphippen Fix raise error when the expectation target is an error instance.
This closes #232

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
94bcf0c
@samphippen samphippen Change error instance implementation to match == instances, or classes
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
654390f
@samphippen samphippen Add some specs for fixed instance raise_error behaviour
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
8ddff5a
@samphippen samphippen Remove the now unused expected_error_class method in raise_error
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
eacf9d4
@samphippen samphippen Use === for type comparison instead of is_a?
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
f3e2118
@samphippen samphippen Interpolate from exception instances in raise_error spec
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
25b21a8
@myronmarston myronmarston Merge pull request #236 from samphippen/fix-raise-error-with-instances
Fix raise error when the expectation target is an error instance.
7f02b50
Commits on Apr 17, 2013
@l15n l15n Fix broken link to Should.md 02241b3
@myronmarston myronmarston Merge pull request #242 from l15n/readme-fix-broken-link
Fix broken link to Should.md
5a02f7b
@l15n l15n Fix broken link to Should.md 8568ac5
@samphippen samphippen Merge pull request #243 from l15n/feature-readme-broken-link
Fix broken link to Should.md in features/built-ins README
aa46195
Commits on Apr 21, 2013
@samphippen samphippen Deprecate `expect { }.not_to raise_error(SpecificErrorClass)`
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
dccf4aa
@samphippen samphippen Add a changelog entry for #244
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
6fb8361
Commits on Apr 24, 2013
@samphippen samphippen Break excessively long line up in raise_error
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
e7e394c
@samphippen samphippen Fix conditionals for raise_error deprecation
includes breaking out an "expecting_specific_exception?" query.

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
dd0e665
@samphippen samphippen Fix up raise_error specs for specific error class deprecation
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
1d6a867
@samphippen samphippen Add an extra space between expect and {} in raise_error
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
d7374d6
@samphippen samphippen Add backticks to the raise_error(SomeClass) error message.
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
06969b2
@samphippen samphippen Remove a debugging print in raise_error
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
919e105
@samphippen samphippen Merge pull request #244 from samphippen/deprecate-not-raise-specific-…
…error-class

Deprecate `expect { }.not_to raise_error(SpecificErrorClass)`
ddb0b7c
Commits on Apr 28, 2013
@tovodeverett tovodeverett Accept duck-typed strings that respond to :to_str as messages
* Modified message validation code to look for duck-typed strings that
  respond to :to_str instead of checking for being a real String.
* Extended test suite to test for and pin down the desired behavior,
  including verifying that objects that respond to :to_s but not :to_str
  are not accepted.
b6070f7
@samphippen samphippen Merge pull request #245 from tovodeverett/master
Accept duck-typed strings that respond to :to_str as messages
e33187c
@samphippen samphippen Add a changelog entry for #245.
[ci skip]

Signed-off-by: Sam Phippen <samphippen@googlemail.com>
6cc78af
Commits on May 01, 2013
@JonRowe JonRowe Show warnings 54a73bc
Commits on May 09, 2013
@tomykaira tomykaira Warn when raise_error receives non-proc object
When a non-proc object is given, `given_proc.call` fails, then `raise_error` or
`raise_error(NoMethodError)` passes.

This behaviour is dangerous and there is actually no error, so it should warn
and fail.
3d76bea
@tomykaira tomykaira Fix warning message 9a9b0f4
Commits on May 10, 2013
@samphippen samphippen Merge branch '247' 242cf21
@samphippen samphippen Add a changelog entry for #247.
Signed-off-by: Sam Phippen <samphippen@googlemail.com>
ab227d3
Commits on May 16, 2013
@dchelimsky dchelimsky use RSpec.deprecate for expect {}.not_to raise_error(SpecificErrorClass) a58ebfa
@dchelimsky dchelimsky smaller regex in expectation to support current and future deprecatio…
…n warnings
3fb7d9f
@dchelimsky dchelimsky use not_to instead of to_not in one spec dc5cff5
@dchelimsky dchelimsky spec that not_to raise_error(SpecificErrorClass) is deprecated
This also removes deprecation warnings that were showing up in rspec's
own output running specs for rspec-expectations.
53276f4
@dchelimsky dchelimsky deprecate not_to raise_error(messsage) 9c3599d
@dchelimsky dchelimsky explicitly enable :should syntax for mocks in cuke
Cuke was failing since we merged expect syntax for mocks into
rspec-mocks master.
8cec950
@dchelimsky dchelimsky explicitly enable :should syntax for mocks in cuke
Cuke was failing since we merged expect syntax for mocks into
rspec-mocks master.
f45b6a6
@dchelimsky dchelimsky clarify deprecation warnings for not_to raise_error(with, args) b956215
@dchelimsky dchelimsky Merge branch 'deprecate-not-to-raise-error-with-message' 4fb086c
@dchelimsky dchelimsky Fix examples that were only failing on jruby f3a99e6
@dchelimsky dchelimsky reduce Ruby warnings in examples 3948cc5
Commits on May 17, 2013
@splattael splattael Fix typo in README.
[ci skip]
43c9c74
@soulcutter soulcutter Merge pull request #248 from splattael/patch-1
Fix typo in README.
48b0440
Commits on May 18, 2013
@dchelimsky dchelimsky fix be_close spec (broken by changes to rspec-core) e455a84
@dchelimsky dchelimsky remove more deprecation warnings da784fc
@dchelimsky dchelimsky remove in_sub_process handling for configuration spec
- was masking legit failures
- also reworked the no-op example
64a3176
@dchelimsky dchelimsky fix examples broken by changes to deprecation warnings in rspec-core 7a0b018
@dchelimsky dchelimsky favor not_to over to_not (but leave in cases that explicitly support …
…to_not)
ab19116
Commits on May 19, 2013
@phiggins phiggins Move test_unit integration code to fix warnings. 433a5c2
@dchelimsky dchelimsky align code in example with the doc string
- doc string says "expect {}.should", but I changed code
  in a previous commit to "expect {}.to"
6364318
Commits on May 21, 2013
@phiggins phiggins Allow a callable object as a custom failure message. 4dae287
Commits on May 22, 2013
@myronmarston myronmarston Merge pull request #250 from phiggins/move_test_unit_code_to_fix_warn…
…ings

Move test_unit integration code to fix warnings.
e0537d9
@phiggins phiggins Move warning message from its own method. 051e257
Commits on May 23, 2013
@dchelimsky dchelimsky use new deprecation API 85416ce
@myronmarston myronmarston Merge pull request #251 from phiggins/callable_object_as_custom_failu…
…re_message

Allow a callable object as a custom failure message.
802b4ee
@myronmarston myronmarston Merge pull request #253 from rspec/new-deprecation-api
use new deprecation API
ded52c2
@dchelimsky dchelimsky convert a cuke to expect syntax 8b1e1d3
@dchelimsky dchelimsky clean up cuke f7a7526
Commits on May 27, 2013
@myronmarston myronmarston Prep changelog for 2.14.0.rc1 release. [ci skip] 18c9352
@myronmarston myronmarston Release 2.14.0.rc1 cde1798