Skip to content


Subversion checkout URL

You can clone with
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-rails
head fork: rspec/rspec-rails
Commits on May 09, 2012
@dchelimsky dchelimsky dev: refactor a spec 0677052
Commits on May 10, 2012
@danrasband danrasband Added configuration to allow for custom application engine. 83e24bc
Commits on May 16, 2012
@danrasband danrasband Make code version specific for rails 3.1 and up
This commit adds Rails version checking to the RSpec application
configuration to handle Rails 3.0.x. The Rails::Engine class, while
available in Rails 3.0, does not have the capability to draw routes as
it does in 3.1 and above.
Commits on May 22, 2012
@dchelimsky dchelimsky refactor matchers to conform to internal changes in rspec-expectations 1cd9a3c
@pixeltrix pixeltrix Update obsolete link to fixture documentation 6781841
@dchelimsky dchelimsky Merge pull request #547 from pixeltrix/patch-1
Update obsolete link to fixture documentation [ci skip]
Commits on May 25, 2012
@brynary brynary Add Code Climate badge e458003
@dchelimsky dchelimsky Merge pull request #548 from brynary/codeclimate-badge
Add Code Climate badge
David Chelimsky gotta change the cukes too!
- Fixes build broken by #547
Commits on May 31, 2012
@jackdempsey jackdempsey built-in scaffold generator already runs the hook for helper fd965a2
Commits on Jun 01, 2012
@dchelimsky dchelimsky Merge pull request #551 from jackdempsey/remove_hook_for_helper
built-in scaffold generator already runs the hook for helper
@dchelimsky dchelimsky Changlog for #551 [ci skip] cfca79e
@dchelimsky dchelimsky add travis banner to README [ci skip] ec87acc
@dchelimsky dchelimsky Take two on the travis banner (grabbed the wrong one the first time)
[ci skip]
@bricker bricker Update Factory Girl examples to replace deprecated syntax 13bf2a4
@justinko justinko Merge pull request #552 from bricker88/patch-1
Update Factory Girl examples to replace deprecated syntax
Commits on Jun 02, 2012
@justinko justinko Update doc for stub_model 68787f7
@justinko justinko Use one-liner for configuration. e09f6e5
@justinko justinko Dev: Fix helper_spec.feature from failing after the first run
Because we manually include `ApplicationHelper` into the `_view`
object, we can't have conflicting method names between the helpers.

This is not really something to worry about with user projects: I
believe most projects use `helper :all` and/or do not utilize
inheritance (include helper in a helper, with conflicting names in

Fixes #554
@justinko justinko Dev: Forgot to "revert" including ApplicationHelper into the singleto…
…n class - `extend` is just fine.
@sferik sferik Use American-English spelling of color as default
This brings the generated `.rspec` file in line with the version used
in the project:
@sferik sferik Default to run specs in random order to catch order dependencies
* Some features still need to run in default order
@alindeman alindeman Merge branch 'sferik-update_template' 12fd9da
@alindeman alindeman Changelog for #501
* Closes #501
@dchelimsky dchelimsky renames `render_template` to `have_rendered`.
Also aliases to `render_template` for backward compatibility
Commits on Jun 03, 2012
@alindeman alindeman Explicitly specify the scope of Rails
* If another gem defines `Rspec::Rails` before us, `Rails` might qualify
  to `Rspec::Rails` (at least in 1.9)
* Fixes #555
Commits on Jun 04, 2012
@danrasband danrasband Tweak alternate app integration
This commit removes most if-statements from the example groups,
consolidating to a global method called `at_least_rails_3_1`. It
also adds filters to the rspec tests and changes engine_support.rb
to application.rb.
Commits on Jun 05, 2012
@rimidl rimidl Fix typo in b86190c
@dchelimsky dchelimsky Merge pull request #558 from rimidl/master
Fix typo in
Commits on Jun 06, 2012
@dchelimsky dchelimsky changelog tweaks [ci skip] f869484
Commits on Jun 09, 2012
@jredville jredville add features to show how namespaced routes can be matched e795ec0
@justinko justinko Merge pull request #559 from jredville/master
add features to show how namespaced routes can be matched
@justinko justinko Revert change to features/routing_specs/ - the documentation…
… for #route_to is sufficient
Commits on Jun 21, 2012
@bnmrrs bnmrrs Removed the extra spaces between methods. They have been mocking me f…
…or months.
@dchelimsky dchelimsky Merge pull request #566 from bnmrrs/patch-1
OPTIMIZATIONS! Removed extra spaces between methods
Commits on Jun 22, 2012
@danrasband danrasband Raise error for Rails 3.0
Adds an override of Rails.configuration.application=(*) setter to
raise an error when Rails.configuration.application is set in Rails
3.0. Also moves at_least_rails_3_1? method to the RSpec::Rails module
as a public module method.
Commits on Jun 23, 2012
@justinko justinko Merge pull request #539 from danrasband/custom-application-configuration
Added configuration to allow for custom application engine.
@justinko justinko Move "at least rails 3.1" method to rspec/rails file. f067d8f
@justinko justinko This should be a writer method spec. 454364b
@justinko justinko Move the "drawing of the routes" for the EngineExample to engine_exam…
@justinko justinko Don't need a file for this. 1f58ed9
Commits on Jun 24, 2012
@justinko justinko Don't need this example - it spec's an accessor. b4b2608
@justinko justinko changelog 489bebc
@justinko justinko No need for explicit return statement. 2fc6473
@justinko justinko Nothing "custom" about this. 1a9d160
@justinko justinko Move the "application swapping" to an `around` filter in the spec_hel…
@justinko justinko After thinking about it, there is nothing "engine specific" about any…
… of this new code. Therefore, no need to have engine specific specs.
@justinko justinko Better changelog message. ebd891f
Commits on Jun 26, 2012
@dchelimsky dchelimsky convert matchers to subclass BaseMatcher class 91870ed
Commits on Jul 07, 2012
@dchelimsky dchelimsky revert all changes for #539
- not ready for release so backing out
- changes are stored in engine-support branch
@dchelimsky dchelimsky bump to 2.11.0 fb2f6f1
Commits on Oct 06, 2012
@dchelimsky dchelimsky include Capybara::DSL and Capybara::RSpecMatchers in spec/features 0c2b2d9
@dchelimsky dchelimsky include RailsExampleGroup in spec/features (necessary when there is n…
…o AR)
Commits on Oct 14, 2012
@dchelimsky dchelimsky add 288cd4d
@dchelimsky dchelimsky prep for 2.11.1 64aaaeb
@dchelimsky dchelimsky need to add to .yardopts b235fcf
@dchelimsky dchelimsky one more rename 0f38c85
@dchelimsky dchelimsky better capy integration docs 9af089c
@dchelimsky dchelimsky prep for 2.11.2 7d23257
@dchelimsky dchelimsky gotta add files to gemspec too 34624a9
@dchelimsky dchelimsky prep 2.11.3 bfa2e95
@dchelimsky dchelimsky OMG, DRY violations in docs - prep for 2.11.4 c8fc8b2
Something went wrong with that request. Please try again.