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-rails
...
head fork: rspec/rspec-rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on May 05, 2012
@dchelimsky dchelimsky Only prepend_before the Rails setup methods
- Fixes #534
- Unfortunately depends on names of methods that are internal to Rails
  and subject to change. Fingers crossed.
71006ce
@dchelimsky dchelimsky ci: add active_record_deprecated_finders to Gemfile so we can run aga…
…inst Rails' master
4f179c4
@dchelimsky dchelimsky dev: bump ammeter to 0.2.5
b6e3ae3
@dchelimsky dchelimsky bump to 2.10.1
63a9efd
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.
acd46c2
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]
f599cdb
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
46e133b
David Chelimsky gotta change the cukes too!
- Fixes build broken by #547
4a30681
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
887f9a4
@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]
6b03bf8
@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
f899083
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
`ApplicationHelper`).

Fixes #554
2a68452
@justinko justinko Dev: Forgot to "revert" including ApplicationHelper into the singleto…
…n class - `extend` is just fine.
654367d
@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: https://github.com/rspec/rspec-rails/blob/master/.rspec
8d7cb3a
@sferik sferik Default to run specs in random order to catch order dependencies
* Some features still need to run in default order
ed03bda
@alindeman alindeman Merge branch 'sferik-update_template'
12fd9da
@alindeman alindeman Changelog for #501
* Closes #501
0ad477a
@dchelimsky dchelimsky renames `render_template` to `have_rendered`.
Also aliases to `render_template` for backward compatibility
6695a58
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
31c5ab6
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.
1c451f8
Commits on Jun 05, 2012
@rimidl rimidl Fix typo in Changelog.md
b86190c
@dchelimsky dchelimsky Merge pull request #558 from rimidl/master
Fix typo in Changelog.md
a4d47cb
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
7579c6e
@justinko justinko Revert change to features/routing_specs/README.md - the documentation…
… for #route_to is sufficient
9abdc0a
Commits on Jun 21, 2012
@bnmrrs bnmrrs Removed the extra spaces between methods. They have been mocking me f…
…or months.
ab6a23d
@dchelimsky dchelimsky Merge pull request #566 from bnmrrs/patch-1
OPTIMIZATIONS! Removed extra spaces between methods
1e8148c
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.
b694543
Commits on Jun 23, 2012
@justinko justinko Merge pull request #539 from danrasband/custom-application-configuration
Added configuration to allow for custom application engine.
248ce66
@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…
…ple.rb
34cbadc
@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…
…per.
cf11980
@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.
dbbec24
@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
603cf3d
@dchelimsky dchelimsky bump to 2.11.0
fb2f6f1
@dchelimsky dchelimsky improve automation for publishing to relishapp.com
3a4d16b
Commits on Jul 08, 2012
@urkle urkle add feature example of alternative usage of errors_on
d798e70
Commits on Jul 21, 2012
@alindeman alindeman Merge pull request #570 from urkle/errors_on
add feature example of alternative usage of errors_on
b7a6db0
Commits on Jul 26, 2012
@dchelimsky dchelimsky dev: fix inclusion of custom Gemfile
10de3e3
@dchelimsky dchelimsky ci: bump to latest rails versions
24b0f3c
Commits on Jul 27, 2012
@dchelimsky dchelimsky ci: update git-sourced dependencies for master and 2-3-stable
274ae67
Commits on Jul 30, 2012
@mrjordangoldstein mrjordangoldstein Include require 'spec_helper' in README code examples, fixes #581
72ceb3c
Commits on Aug 01, 2012
@henrik henrik Clarify when webrat/capybara autoloading applies.
Since I got it wrong: #360
3622324
@dchelimsky dchelimsky Merge pull request #585 from henrik/patch-1
Clarify when webrat/capybara autoloading applies.
f8ab2ba
Commits on Aug 03, 2012
@dchelimsky dchelimsky Add should and should_not to CollectionProxy
- Fixes #588.
- Fixes #445.
abfd0fc
Commits on Aug 05, 2012
@dchelimsky dchelimsky dev: update dev dependencies
4187a26
@dchelimsky dchelimsky Revert "Add should and should_not to CollectionProxy"
This reverts commit abfd0fc.
f9ebca7
Commits on Aug 06, 2012
@myronmarston myronmarston A better fix for CollectionProxy#should.
- Delay the fix so that users can configure a different expectation framework.
- Handle the right class for rails 3.0 (AssociationProxy) and 3.1+ (CollectionProxy).

- Fixes #588.
- Fixes #445.
6b4b5cf
@myronmarston myronmarston A couple fixes from @dchelimsky's comments. 48a0d0c
@banyan banyan Accept namespace with double-colon 909af09
Commits on Aug 07, 2012
@alindeman alindeman Merge pull request #591 from banyan/namespace-with-double-colon
Accept namespace with double-colon
506ca41
@alindeman alindeman Changelog for #591
[ci skip]
d818afe
@alindeman alindeman README uses expect() syntax 9324260
@alindeman alindeman Merge pull request #582 from mrjordangoldstein/master
Include require 'spec_helper' in README code examples, fixes #581
e60f6e2
@alindeman alindeman Features use new expect() syntax a65ff6e
@alindeman alindeman Merge pull request #593 from rspec/features_use_expect_syntax
Features use new expect() syntax
1ff5c96
@dchelimsky dchelimsky ci: run against rails-3.2.8.rc2 8d3ab42
@alindeman alindeman Merge pull request #592 from rspec/readme_uses_expect_syntax
README uses expect() syntax
fb55955
Commits on Aug 18, 2012
@jonhyman jonhyman Checking for existence of ActiveRecord in proxy.rb before getting con…
…stants from it.
780c42b
@dchelimsky dchelimsky only add should[_not] to ActiveRecord classes if AR defined 07d6a1a
@dchelimsky dchelimsky Revert "only add should[_not] to ActiveRecord classes if AR defined"
This reverts commit 07d6a1a.
faf8736
@dchelimsky dchelimsky Merge pull request #599 from jonhyman/feature/ar-check
Checking for existence of ActiveRecord in proxy.rb before getting constants from it.
928a3d2
Commits on Sep 08, 2012
@dchelimsky dchelimsky replace 'it "should' with 'it "does' (using should_clean gem) 69a63ce
Commits on Sep 11, 2012
@patmaddox patmaddox Update README w/ links to Factory Girl & Capybara 63d9abc
Commits on Sep 12, 2012
David Chelimsky Gemfile-custom updates 8c93c27
@woahdae woahdae Support validation contexts when using #errors_on
Previously, Model#errors_on calls Model#valid?, which will both clear
the errors hash and run validations in the default context. This adds an
:context option to #errors_on that gets passed to #valid?, allowing using
errors_on with validation contexts.

Exmaple usage:

    class Foo
      validates :name, length: {minimum: 20}, on: :publication
    end

    describe Foo
      it 'should have a name greater than 20 characters on publication' do
        subject.name = 'too short'
        subject.name.should have(1).error_on(:name, context: :publication)
      end
    end
8bedbf0
@alindeman alindeman Merge branch 'errors_on_with_validation_context'
a875557
@alindeman alindeman Changelog for #605
[ci skip]
0b24f14
@alindeman alindeman Uses latest versions of Rails for CI 7a019a6
Commits on Sep 13, 2012
@alindeman alindeman Fixes name of ActiveRecord deprecated finders gem f48946e
@alindeman alindeman Installs bundler 1.2 on Travis which is required for Rails master 410ad03
@alindeman alindeman Reduces time needed to install/compile gems on @travis-ci 171f869
Commits on Sep 15, 2012
@alindeman alindeman Simply install the latest version of bundler f9d696b
@alindeman alindeman --trace runs of tests inside the sample app (debugging travis weirdness) bc5956a
@alindeman alindeman Fixes the build on Rails master
* `self.table_name=` has been preferred for a while (and supported since
  Rails 3.0.0); `set_table_name` is gone in Rails 4.
c771682
Commits on Sep 16, 2012
@alindeman alindeman Abort with non-zero exit status if any command fails 4dddd85
Commits on Sep 18, 2012
@agirorn agirorn Using contain in the View specs example is misleading because it does…
… not work without including an extra gem.
c268810
Commits on Sep 19, 2012
@dchelimsky dchelimsky Merge pull request #608 from agirorn/use_include_in_view_spec_example
Using contain in the View specs example is misleading.
be689da
Commits on Sep 24, 2012
@alindeman alindeman Scaffolded controller specs are compatible with Rails 4
* Rails 4 introduces
  [strong_parameters](https://github.com/rails/strong_parameters).
* If a model is scaffolded with attributes (e.g., `rails generate
  scaffold foo bar:string`), Rails will generate a controller that only
  accepts `bar`. This means that the controller spec must be aware of
  the specific parameters when sending PUT (update) requests.
* Furthermore if a model is scaffolded with attributes, Rails generates
  a controller that *requires* the #presence of attributes. This means
  we cannot send in an empty Hash, as the Rails framework will return a
  400 Bad Request.
86b0799
Commits on Sep 25, 2012
@alindeman alindeman Merge pull request #611 from alindeman/rails4
Scaffolded controller specs are compatible with Rails 4
87ebea1
Commits on Oct 01, 2012
@alindeman alindeman Adds example of using render_template in a view spec
* This is currently failing under Rails 4.0
6185a5d
@alindeman alindeman Correctly assign @gadgets so the view renders properly 8474e9d
Commits on Oct 04, 2012
@blowmage blowmage Remove unnecessary require
The rake task doesn't use core, and doesn't need the DSL loaded to work.
Having core loaded stomps on minitest if in the same project.
90f3302
@blowmage blowmage Update dependencies in the gemspec
Switch dependency away from 'rspec' because it loads core, which loads the DSL.
This change allows rspec-rails to live side-by-side with minitest-rails.
f5a5735
Commits on Oct 05, 2012
@dchelimsky dchelimsky Merge pull request #615 from blowmage/minitest-rails
Allow rspec-rails rake task to live with minitest-rails
0be66ba
Commits on Oct 06, 2012
@dchelimsky dchelimsky include Capybara::DSL and Capybara::RSpecMatchers in spec/features 9332167
@dchelimsky dchelimsky add RequestExampleGroup to specs in spec/api
1c9e2b7
@dchelimsky dchelimsky Changelog 0dbd908
@dchelimsky dchelimsky include RailsExampleGroup in spec/features (necessary when there is n…
…o AR)
a77de85
Commits on Oct 07, 2012
@alindeman alindeman Sets `#controller_path` in all versions of Rails
* Fixes #316
724578d
@alindeman alindeman Merge branch 'issue_316' 3214564
Commits on Oct 09, 2012
@alindeman alindeman Improves developer documentation 1f8b20d
@alindeman alindeman Be a little more forgiving when RAILS_VERSION or .rails-version does …
…not exist
1dd534b
Commits on Oct 12, 2012
@vanstee vanstee Identify ruby code for syntax highlighting
Fixes #617
78b151a
@alindeman alindeman Merge pull request #619 from vanstee/ruby_file_doc_strings
Identify ruby code for syntax highlighting
662c9c8
Commits on Oct 13, 2012
@alindeman alindeman Generated specs support module namespacing (e.g., in a Rails engine)
* Fixes #448
9ab382c
Commits on Oct 14, 2012
@dchelimsky dchelimsky add CAPYBARA.md
a41a95b
@dchelimsky dchelimsky prep for 2.11.1 d568851
@dchelimsky dchelimsky need to add Capybara.md to .yardopts 3d54ead
@dchelimsky dchelimsky one more rename c5bdbfb
@dchelimsky dchelimsky better capy integration docs 6f551cd
@dchelimsky dchelimsky tweak capy integration docs 732e148
@dchelimsky dchelimsky gotta add files to gemspec too
2a1eac6
@dchelimsky dchelimsky OMG, DRY violations in docs - prep for 2.11.4 087f8f1
Commits on Oct 17, 2012
@jfirebaugh jfirebaugh Fix bare #render in view specs on Rails 3.1
656ff3 made this compatible with 3.2 by splitting the
name of the template in the description into its base
name, locale, format and handler components, but in
doing so broke compatibility with 3.1 and earlier,
which does not support the extra options.
5f869c1
Commits on Oct 20, 2012
@alindeman alindeman Merge pull request #624 from jfirebaugh/render_3.1
Fix bare #render in view specs on Rails 3.1
189fbdb
@alindeman alindeman Changelog for #624 [ci skip]
b8392ac
@bjnord bjnord Removes AutoTest config/ exception
* Mappings for files under config/ will work
* Fixes #625
* Closes 627
738fd0d
Commits on Oct 24, 2012
@alindeman alindeman Adds custom failure messages for #be_new_record matcher
* Fixes #628
60b4c27
Commits on Oct 27, 2012
@alindeman alindeman A first stab of fixing `assert_template` in Rails 4 view specs
* It's relatively unobtrustive, but feels quite dirty. I'm hoping this
  is a temporary fix that produces feedback on something better.
601483f
@alindeman alindeman Capybara feature specs may use Rails URL helpers 96e1c33
@alindeman alindeman Documents how to customize `rake spec`
* Closes #521
00ee369
Commits on Nov 06, 2012
@jayeff jayeff Fix link to Capybara.md on rubydoc.info
reflect rename
7d478ee
@dchelimsky dchelimsky Merge pull request #633 from jayeff/master
Capybara.md was renamed, reflect this change in Changelog.md
4211c07
@alindeman alindeman Merge pull request #630 from alindeman/capybara_url_helpers
Capybara feature specs may use Rails URL helpers
fd25838
Commits on Nov 09, 2012
@TKAB TKAB Update Capybara.md
Fixed confusing type error.
a73dab4
@alindeman alindeman Merge pull request #634 from TKAB/patch-1
Really rspec-2.11.1 or rspec-rails-2.11.1
3865507
@alindeman alindeman Revert "Capybara feature specs may use Rails URL helpers"
This reverts commit 96e1c33.

* We'll instead use an implementation that adds a proper
  FeatureExampleGroup (see #632)
1152131
Commits on Nov 10, 2012
@jnicklas jnicklas Add example group for features
This fixes various issues with the integration between RSpec and Capybara 2.0.

- It includes Route helpers, these were previously unavailable, due to
  the fact that the only reason they are available in request spec is
  that those delegate via method_missing to an IntegrationTest instance.

- It adds the `:feature` type to all features. This way people can
  include module into `:type => :feature` examples and they will work
  when their specs are places in this folder.

David previously commented that he didn't want to add Capybara specific
behaviour outside of `rspec/rails/capybara`. I was careful to avoid
doing that. The feature example group does not explicitly include
Capybara, instead, Capybara is included due to Capybara itself hooking
into `:type => :feature`. This is much cleaner than the way it was
before.

I tested this against both a freshly generated Rails app, as well as an
existing, rather large project, both worked well.
0fda98b
Commits on Nov 11, 2012
@alindeman alindeman Adds cukes for feature specs (capybara integration) 6e68bdd
@alindeman alindeman Replaces `match` with `get`. `match` is removed in Rails 4 56473fd
Commits on Nov 12, 2012
@dchelimsky dchelimsky Add rails-2.3.9 to travis config a731794
Commits on Nov 13, 2012
@alindeman alindeman prep for 2.12 dcabc3a
@alindeman alindeman Wraps code in backticks
[ci skip]
623c362
@alindeman alindeman Updates cucumber feature for changes to ActiveRecord in Rails 4
* Rails 4 deprecates #scoped in favor of #all
1d9514f
@alindeman alindeman Updates to rake 10 as 0.9.3 introduces incompatibilities bbd6f36
@dchelimsky dchelimsky --trace is now --backtrace fb9eda1
@dchelimsky dchelimsky bump version to 2.12 edd4a73