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 Apr 19, 2011
@dchelimsky dchelimsky reinstate cukes/aruba and add 3.0.7 gemfile dea4e4b
Commits on Apr 20, 2011
@dchelimsky dchelimsky doc updates 5d2dd10
Commits on Apr 21, 2011
@justinko justinko request_spec.feature - Closes #186 646c00e
@justinko justinko request_spec.feature to Relish .nav 7716caf
Commits on Apr 23, 2011
@dchelimsky dchelimsky Rework the build to make it more travis-friendly. 023887f
@dchelimsky dchelimsky tell travis to run 'rake ci' 9e84778
@dchelimsky dchelimsky add --trace to rake ci for travis 5331824
@dchelimsky dchelimsky reword request spec narrative 3bb1b1d
@dchelimsky dchelimsky reorder the nav 4fe386d
Commits on Apr 24, 2011
@justinko justinko singular 6385228
@dchelimsky dchelimsky Update the controller spec generated by the scaffold generator.
- use any_instance where appropriate
- remove mock_model
- add some documentatio
daef552
@dchelimsky dchelimsky Revert "Rework the build to make it more travis-friendly."
This reverts commit 023887f.
9fde587
@dchelimsky dchelimsky Dev: Updates to support binstubs getting generated. 0a4c46c
@dchelimsky dchelimsky try quoting c1b8bca
@dchelimsky dchelimsky config tweaks 52012b8
@dchelimsky dchelimsky exclude dev-only gems for builds on travis 792afc3
@dchelimsky dchelimsky on one line, please 5ad01e1
@dchelimsky dchelimsky simplify 64002d7
@dchelimsky dchelimsky changelog 29415d8
@dchelimsky dchelimsky run bundle install if it hasn't been run yet 1789ce2
@dchelimsky dchelimsky try again with something that might work\! 258d268
@dchelimsky dchelimsky remove obsolete require abee222
@dchelimsky dchelimsky gotta try the setup again\! 29bdf97
@dchelimsky dchelimsky run one travis build until we get it passing - then we can add the ot…
…her ruby and rails versions back in
a145e10
Commits on Apr 25, 2011
@dchelimsky dchelimsky travis config: remove PWD from gemfile paths 841e364
@dchelimsky dchelimsky travis config: two rubies (to trigger matrix build) f5a70a8
@dchelimsky dchelimsky travis config: add extra gemfile 5dcdc62
@dchelimsky dchelimsky Update Capybara integration to support 0.4 and 1.0
- this adds capybara matchers to view and helper specs
- Closes #302.
59793dc
@dchelimsky dchelimsky limit cukes to rspec and rails APIs 33c14a2
Commits on Apr 26, 2011
@dchelimsky dchelimsky doc update e77d224
@dchelimsky dchelimsky typo in comment in generated spec 0434b57
Commits on Apr 28, 2011
@amerine amerine Override append/prepend_view_paths in controller specs
- inject rspec-rails' path delegator resolver
- Closes #359.
39961a0
Commits on Apr 29, 2011
@dchelimsky dchelimsky Refactor controller/view_paths extensions for view isolation
- handle both Strings and PathSets passed to append_view_path or
  prepend_view_path
7cd0f5e
@dchelimsky dchelimsky changelog 443aa7c
Commits on Apr 30, 2011
@dchelimsky dchelimsky prep for 2.6.0.rc3 0235a9d
Commits on May 01, 2011
@dchelimsky dchelimsky changelog tweaks 2326c5d
@dchelimsky dchelimsky bump to 2.6.0.rc4 cc6f35d
Commits on May 04, 2011
@be9 be9 Require capybara after rspec/rails/example
Otherwise Capybara's includes are not set correctly.

- Closes #360
- Closes #362
d0e790e
@dchelimsky dchelimsky centralize Capybara config ec15a2f
@dchelimsky dchelimsky changelog b1f5b8f
@dchelimsky dchelimsky sometimes there is no capy at all 154b7de
@dchelimsky dchelimsky update gemfile for 3-0-stable 61b9fbb
@dchelimsky dchelimsky centralize the webrat config as well dbce7d2
@dchelimsky dchelimsky move webrat and capybara configs to vendor 92bad32
Commits on May 05, 2011
@dchelimsky dchelimsky Support controller specs with both Rails 3.0 and 3.1
- also removed a couple of cukes that are obsolete in 3.1
4597ecd
@dchelimsky dchelimsky build against rails 3.1.0.beta.1 on travis 877ac18
Commits on May 06, 2011
@dchelimsky dchelimsky Define name before subclassing in anonymous controller spec
- this is necessary because Rails 3.1 relies on name in an inherited
  hook.
9ebf963
@joelmoss joelmoss Relax the dependencies on rails gems to >= 3.0
- Closes #364.
7d4c1fc
@dchelimsky dchelimsky Dev: add the gems from the Gemfile generated by 'rails new ...' 69770e6
@dchelimsky dchelimsky prep for 2.6.0.rc5 ad77a8d
@dchelimsky dchelimsky prep for rc6 ac2ac25
@dchelimsky dchelimsky raise when trying to build gem if Psych is defined 58b7d20
@dchelimsky dchelimsky Restore the dependencies on the rails gems to ~> 3.0, which includes any
rails < 4.0.

This reverts commit 7d4c1fc.
90dff20
Commits on May 07, 2011
@dchelimsky dchelimsky update render_template matcher doc a7c68a3
@dchelimsky dchelimsky Dev: enhance thor tasks d756e02
@dchelimsky dchelimsky Dev: don't generate rails files we don't need 0bac5cc
@dchelimsky dchelimsky CI: just run one travis build (testing something out) 0a16c83
@dchelimsky dchelimsky Dev: remove unused gems from gemfile for rails 3.1.0.beta1 944478b
@dchelimsky dchelimsky Dev:try disabling assets b46819c
@dchelimsky dchelimsky Dev: no need to update for beta gems 162edd9
@dchelimsky dchelimsky Dev: remove wrap_parameters initializer if present 2a74f08
@dchelimsky dchelimsky Restore travis config to run multiple versions of ruby and rails
This reverts commit 0a16c83.
bcaf04c
Commits on May 10, 2011
@reu reu Excluding spec folder from rcov metrics 7bfde3b
Commits on May 12, 2011
@dchelimsky dchelimsky Dev: improved thor task a6cd192
@dchelimsky dchelimsky prep for 2.6.0 9a0d207
Commits on May 13, 2011
@dchelimsky dchelimsky docs 2431a2a
@dchelimsky dchelimsky align docstring w/ example in cuke 9ba888c
Commits on May 16, 2011
@dchelimsky dchelimsky add page on rspec/rails version compatibility 70a57aa
Commits on May 17, 2011
@dchelimsky dchelimsky Revert "Dev: remove wrap_parameters initializer if present"
- need this to be there to prove out integration works

This reverts commit 2a74f08.
94f6bfa
@dchelimsky dchelimsky Revert "Define name before subclassing in anonymous controller spec"
- this had been done to get around a problem in rails-3.1.0.beta1, but
  that issue has been addressed in the coming rails-3.1.0.rc

This reverts commit 9ebf963.
59e3c45
@dchelimsky dchelimsky Dev: rails 3.1 depends on released arel ae1d371
@alindeman alindeman Add failing cuke to demonstrate regression with around_filter 631e889
@dchelimsky dchelimsky CI: remove build against rails-3.1.0.beta1 as master
- 3.1.0.rc is coming shortly
c522c45
@dchelimsky dchelimsky Change name of anonymous controller to AnonymousController d08601e
Commits on May 18, 2011
@dchelimsky dchelimsky Merge pull request #366 from reu/patch-1
Excluding spec folder from rcov metrics
aed96ae
@dchelimsky dchelimsky Dev: rails master depends on released rack now 96222d6
Commits on May 19, 2011
@dchelimsky dchelimsky update Changelog 91b78d0
@dchelimsky dchelimsky doc: add note about helpers defined in controllers 8b5260b
Commits on May 22, 2011
@jackdempsey jackdempsey guard against calling prerequisites on nil
- Closes #377.
- Closes #378.
8bc247d
@dchelimsky dchelimsky changelog 99ac04d
@dchelimsky dchelimsky a3.1.0.rc1 to build 29809a9
@dchelimsky dchelimsky changelog b374101
@dchelimsky dchelimsky Dev: lock rake 0.8.7 a66b22d
@dchelimsky dchelimsky ci: use bin/rake to ensure the locked rake version 7cab06b
@dchelimsky dchelimsky ci: add --binstubs to bundler args 894ab96
@dchelimsky dchelimsky ci: quote args 1a8c4ef
@dchelimsky dchelimsky ci: one more try with --binstubs 4656e6d
@dchelimsky dchelimsky ci: binfiles are in gemfiles/bin/ 129dc19
@dchelimsky dchelimsky ci: shell out to bin/rake to lock down the rake version eb3f3be
@dchelimsky dchelimsky bump to 2.6.1.beta1 99687c0