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
This comparison is big! We’re only showing the most recent 250 commits
Commits on Oct 02, 2010
@dchelimsky dchelimsky Hook into rails-3 generators using 3.0 and 3.1 APIs
- Rails-3.1 will change the API for hooking into generators from
  "config.generators" to "config.app_generators".
- This commit supports either.
@dchelimsky dchelimsky Rails 3.0.1 and up uses view_assigns instead of _assigns. This commit
supports both.
Commits on Oct 05, 2010
@dchelimsky dchelimsky Need to support view_assigns in either case. 5a35718
@dchelimsky dchelimsky update post-commit message 2c657da
@dchelimsky dchelimsky add some thor tasks to help with development 5aba0cd
@dchelimsky dchelimsky update history 7698f41
@dchelimsky dchelimsky bump version to 2.0.0.rc 17816d2
@dchelimsky dchelimsky Add -Ispec to rcov_opts in spec:rcov rake task.
- Closes #229.
Commits on Oct 06, 2010
@dchelimsky dchelimsky Revert "Add -Ispec to rcov_opts in spec:rcov rake task."
This reverts commit 2644b79.

- rspec-core now ensures that -Ispec is added to rcov_opts
@dchelimsky dchelimsky route_to delegates to assert_recognizes rather than assert_routing
- aligns better with the matcher name
- eliminates failures on alternate routes to same controllers
- route generation can be spec'd in the context of view specs
- Closes #221.
Commits on Oct 08, 2010
@dchelimsky dchelimsky Generate stub_model(X).as_new_record in generated "new" view specs
- Closes #232.
@dchelimsky dchelimsky add rails-related dirs to the default backtrace_clean_patterns 73051af
@matthewtodd matthewtodd Make Autotest::RailsRspec2 honor spec/support/*.rb
Previously, it looked at a subdirectory called "shared," but the
generated spec_helper guides us towards one named "support" instead.

(Alternatively, we could have changed the generated spec_helper to
suggest "shared" instead, but since cucumber uses "features/support,"
this seems like a good choice.)

- Closes #233.
@dchelimsky dchelimsky convert some befores to lets bfb7792
Commits on Oct 10, 2010
@dchelimsky dchelimsky words 98de837
@dchelimsky dchelimsky add a little relish 2a14c75
@dchelimsky dchelimsky words fffa8c8
@dchelimsky dchelimsky tweak post-install message b48ee00
@dchelimsky dchelimsky prep for 2.0.0 6526142
@dchelimsky dchelimsky lock down a couple of gems 3b69fd6
@dchelimsky dchelimsky one default,please fdc4160
Commits on Oct 11, 2010
@dchelimsky dchelimsky require 'rspec/core' before using RSpec.configure
- Closes #236.
@dchelimsky dchelimsky Generated mock_[model] method adds (optional) stubs on each reference.
- This fixes an edge case bug that appears when defining stubs using the
  lazy-eval'd block form (obj.stub(:m) {v}).
- Closes #218.
@dchelimsky dchelimsky words 953eefc
Commits on Oct 12, 2010
@dchelimsky dchelimsky Offer option to suppress generation of request spec
- also renamed a bunch of generator methods to make them all more
- Closes #237.
Commits on Oct 13, 2010
@dchelimsky dchelimsky words 1b82c1f
Commits on Oct 15, 2010
@baldowl baldowl Tweaked assign() to work with Ruby on Rails 3.0.1.
- Closes #243.
@dchelimsky dchelimsky Hack to ensure view_assigns does the right thing without checking the
Rails version.
@dchelimsky dchelimsky Dev: update thor tasks. 1bc06c8
@dchelimsky dchelimsky History e9dca62
@dchelimsky dchelimsky bump version to 2.0.1 235b79c
Commits on Oct 18, 2010
@dchelimsky dchelimsky update versions bdd0067
@dchelimsky dchelimsky words 1d9ce72
Commits on Oct 19, 2010
@dchelimsky dchelimsky Remove 'require "rspec/core/backward_compatibility"'
- Closes #248.
Commits on Oct 20, 2010
@dchelimsky dchelimsky -words 0f8d020
Commits on Oct 22, 2010
@dchelimsky dchelimsky update dependencies across development repos f28a689
Commits on Oct 23, 2010
@dchelimsky dchelimsky links to docs bb43457
Commits on Oct 24, 2010
@dchelimsky dchelimsky Properly deprecate integrate_views 49c87d5
Commits on Oct 31, 2010
@dchelimsky dchelimsky dependencies, deschmendencies deffa66
Commits on Nov 01, 2010
@dchelimsky dchelimsky run subdirectory tasks with_new_environment ebadb0f
Commits on Nov 06, 2010
@dchelimsky dchelimsky Move error[s]_on to ActiveModel::Validations so it can be used by other
ActiveModel compliant ORMs

- Closes #251.
@dchelimsky dchelimsky remove direct dep on arel b8ae95e
@dchelimsky dchelimsky just ask if AR is defined instead
- Closes #254.
@dchelimsky dchelimsky properly isolate cuke env c18002b
Commits on Nov 07, 2010
@dchelimsky dchelimsky Gemfile tweaks efbe630
@dchelimsky dchelimsky use bundler's mechanism, silly 90a5a58
@dchelimsky dchelimsky history 84d1f49
@dchelimsky dchelimsky bump to 2.1.0 59549cc
@dchelimsky dchelimsky update relish task 359b311
@dchelimsky dchelimsky update versions for development 2fc21b4
Commits on Nov 10, 2010
@jdelStrother jdelStrother Fix inclusion of default helper to ViewExampleGroup
I suspect it's been broken ever since
6f254ac60a95aab7eafc56f0f19267ca9cb6412a in rspec-core

- Closes #259.

Signed-off-by: Jonathan del Strother <>
@dchelimsky dchelimsky history 41b01ee
Commits on Nov 18, 2010
@dchelimsky dchelimsky Add License bcb4ba6
@dchelimsky dchelimsky history 14f0f4e
Commits on Nov 19, 2010
@dchelimsky dchelimsky No need to require RSpec::Matchers now that it's managed by
@dchelimsky dchelimsky History 52cf362
@dchelimsky dchelimsky History 68a7988
Commits on Nov 22, 2010
@dchelimsky dchelimsky Clarify RDoc for mock_model
- emphasize the fact that it supports the ActiveModel API, not
@dchelimsky dchelimsky Add gem dependency on rails ~> 3.0.0
- Closes #267.
@dchelimsky dchelimsky History 5ae898e
Commits on Nov 23, 2010
@dchelimsky dchelimsky Add stub_template method for view specs.
- supports stubbing partials rendered by views in view specs
- Closes #263.
@dchelimsky dchelimsky update history/upgrade w/ info about stub_template 012fd22
@dchelimsky dchelimsky don't generate :new_record? => false d38e51f
@dchelimsky dchelimsky revert changes that broke controller specs 883fe01
Commits on Nov 25, 2010
@dchelimsky dchelimsky method_missing is private 1657d18
@dchelimsky dchelimsky explain README links to documentation 1e2b17e
@rgarner rgarner Explicit template/layout render example
- Closes #270.
@dchelimsky dchelimsky upgrade to cucumber 0.9.4 f747082
Commits on Nov 28, 2010
@dchelimsky dchelimsky whitespace (silly) 5c1fce0
@dchelimsky dchelimsky prep for 2.2 release 840aa86
@dchelimsky dchelimsky bump version to 2.2 3025e80
Commits on Nov 29, 2010
@solnic solnic Depend on railties, activesupport and actionpack instead of monolithi…
…c rails gem

- Closes #275.
@dchelimsky dchelimsky history db88d25
@dchelimsky dchelimsky Update deps
- rspec ~> M.m.0 (3 digits instead of 2)
- rails gems >= 3.0.0 (not ~> 3.0.0)
Commits on Nov 30, 2010
@dchelimsky dchelimsky links 1a881dd
@dchelimsky dchelimsky Point cucumber dev dependency to my fork which depends on builder.
- filed pull request with cucumber project - can revert this if/when
  that is merged/released.
@dchelimsky dchelimsky Gemfile can still depend on rails for development 6eb2b25
Commits on Dec 01, 2010
@dchelimsky dchelimsky Got webrat working across request and controller specs
- added --webrat flag for request controller generator
- deprecated --webrat-matchers flag across generators
- Closes #277.
@dchelimsky dchelimsky bump version to 2.2.1 41ac174
@dchelimsky dchelimsky Make rails gem deps work for anything < 4.0 9bb8406
@dchelimsky dchelimsky bump version to 2.3.0.pre 211ae45
Commits on Dec 02, 2010
@dchelimsky dchelimsky docs 9394e97
Commits on Dec 07, 2010
@dchelimsky dchelimsky mock_model.respond_to?(xxx_before_type_cast) returns false
- Closes #266.
Commits on Dec 11, 2010
@dchelimsky dchelimsky Don't generate autotest/discover.rb f47e87b
@dchelimsky dchelimsky README for features (for relish) 7003fe6
@dchelimsky dchelimsky .rspec 5716c91
Commits on Dec 12, 2010
@dchelimsky dchelimsky the final frontier b92acde
@dchelimsky dchelimsky 1.8.7 regexps don't work the same way 1.9's do 9526037
@dchelimsky dchelimsky align Gemfiles across rspec dev repos 87e42c4
@dchelimsky dchelimsky prep for 2.3.0 release 888dd19
Commits on Dec 13, 2010
@dchelimsky dchelimsky organize relish nav 7f9921b
@dchelimsky dchelimsky Fix bug in which rspec:install generator tries to copy autotest files
that don't exist.

- Closes #283
@dchelimsky dchelimsky add .rspec file for autotest 7556316
@dchelimsky dchelimsky respond_to?(method, include_private=false)
- Closes #282.
Commits on Dec 14, 2010
@dchelimsky dchelimsky bump version to 2.4.0.pre a37ce52
Commits on Dec 17, 2010
@dchelimsky dchelimsky don't need to pass the 2nd arg to respond_to on public method 6fb82d1
@dchelimsky dchelimsky minor cuke adjustments 90955b2
@dchelimsky dchelimsky history 3243461
@dchelimsky dchelimsky add wip scenario for global render_views 44c81aa
@dchelimsky dchelimsky Add config.render_views for global setting to render views.
- Closes #291.
Commits on Dec 18, 2010
@dchelimsky dchelimsky dev-support: update relish task 86c6bc0
@dchelimsky dchelimsky use md for markdown files 2d89bc9
Commits on Dec 19, 2010
@dchelimsky dchelimsky Change a couple of message expectations to stubs in order to clarify
intent in generated controller specs.
Commits on Dec 20, 2010
@dchelimsky dchelimsky render_views (and render_views(false)) overrides parent setting in
nested groups.

- Closes #295.
Commits on Dec 21, 2010
@dchelimsky dchelimsky doc improvements (routing specs) 609acea
@dchelimsky dchelimsky helper spec tweak 6717927
@dchelimsky dchelimsky Include ApplicationHelper in helper object in helper specs.
- Closes #276.
@dchelimsky dchelimsky more history 713e4d8
Commits on Dec 23, 2010
@dchelimsky dchelimsky add Upgrade notes for relish site 8bb3cd5
@dchelimsky dchelimsky doc tweaks 026fb86
@dchelimsky dchelimsky Use ActiveSupport::TestCase::Assertion (which knows whether we're using
Test::Unit or MiniTest).

- Closes #297.
Commits on Dec 26, 2010
@dchelimsky dchelimsky doc improvements 20e1a6e
Commits on Dec 31, 2010
@spangenberg spangenberg This gem don't create any longer the autotest/discover.rb
- Closes #299.
Commits on Jan 01, 2011
@dchelimsky dchelimsky Include rails-specific example group extensions based on :type key.
- e.g. describe "something", :type => :controller do
- reworked internal module inclusion functionality
- include request spec extensions in spec/integration for ease of
  upgrade from rspec-rails-1.x
- Closes #256.
@dchelimsky dchelimsky Deprecate include_self_when_dir_matches 3882e0a
@dchelimsky dchelimsky history 0a9ac23
@dchelimsky dchelimsky docs 909fa3b
Commits on Jan 02, 2011
@dchelimsky dchelimsky Apply stubs immediately to mock_model generated in controller specs. ec3b8af
@dchelimsky dchelimsky prep for 2.4.0 release cad57a1
@dchelimsky dchelimsky doc tweak 5a5e26d
@dchelimsky dchelimsky doc tweaks 3a5cba4
Commits on Jan 03, 2011
@dchelimsky dchelimsky include RSpec::Rails::RailsExampleGroup before other modules that nee…
…d its services
@dchelimsky dchelimsky bump version to 2.4.1 e0fe809
@dchelimsky dchelimsky fix changelog links 90dadf2
@dchelimsky dchelimsky update versions and links 9959529
Commits on Jan 11, 2011
@dchelimsky dchelimsky bump cucumber to 0.10 a94f6f9
@dchelimsky dchelimsky set up connections in mock/stub_model specs
- less invasive than stubbing AR internals
Commits on Jan 15, 2011
@dchelimsky dchelimsky doc tweaks
- Closes #305.
Commits on Jan 16, 2011
@dchelimsky dchelimsky cukes 78a3307
@dchelimsky dchelimsky Fix bug where 'render_views(false)' in a nested group set value in its
parent group.
@CodeMonkeySteve CodeMonkeySteve Only include MailerExampleGroup if defined.
- Closes #307.
Commits on Jan 25, 2011
@dchelimsky dchelimsky separate Gemfiles for different versions of rails 25407a8
Commits on Jan 26, 2011
@dchelimsky dchelimsky update autotest integration doc dbe989e
@dchelimsky dchelimsky Update rdoc for controller specs.
- Closes #313.
Commits on Jan 27, 2011
@dchelimsky dchelimsky move some docs around 3b279c6
Commits on Feb 05, 2011
@r38y r38y Mock models should not be blank?. d33a28e
@dchelimsky dchelimsky changelog 1a0508a
@rezaprima rezaprima use index_helper instead of table_name for controller paths 057000c
@dchelimsky dchelimsky dev: add bundle install to thor rails:use 00b7ed1
@pacoguzman pacoguzman Fix typo => router to routes bb14e35
@dchelimsky dchelimsky changlog ad7fb9f
@dchelimsky dchelimsky _, _ 18c7d9d
@dchelimsky dchelimsky prep for 2.5 release dbc0485
Commits on Feb 07, 2011
@dchelimsky dchelimsky doc tweaks cefbfc6
Commits on Feb 14, 2011
@dchelimsky dchelimsky docs da115b9
Commits on Feb 15, 2011
@dchelimsky dchelimsky typo in changelog 66fb819
Commits on Feb 18, 2011
@dchelimsky dchelimsky dev: make the rails version setup more generic 15edeb4
Commits on Feb 25, 2011
@justinko justinko Doc change: require rspec/rails, not rspec/core. Closes #330 7356356
Commits on Mar 05, 2011
Joe Fiorini shortcuts for specifying routes that align better with rails 3 APIs. 878b7cf
@dchelimsky dchelimsky tweak routing spec cukes and changelog 20411fd
@dchelimsky dchelimsky generalize the Assertion failure to work with ruby-1.8 and ruby-1.9 0eb7e89
@dchelimsky dchelimsky clarify intent 598f7ec
@dchelimsky dchelimsky remove redundancy 5b492c7
@dchelimsky dchelimsky use shortcuts in generated routing specs ccd0009
Commits on Mar 23, 2011
Curtis Schofield mailer should be mailers. Closes #338 e3a806f
@justinko justinko changelog abf5d57
Commits on Mar 25, 2011
@dchelimsky dchelimsky remove obsolete file ca78581
@dchelimsky dchelimsky upgrade cucumber and aruba 2a0c0d7
Commits on Mar 27, 2011
@dchelimsky dchelimsky doc tweak b31bf67
Commits on Mar 29, 2011
@dchelimsky dchelimsky Dev: no need to bundle:install in the generated app 5b88686
@dchelimsky dchelimsky Dev: --force the generator to overwrite one of the specs generated
@dchelimsky dchelimsky Dev: use the git protocol in the Gemfiles 81c5ea3
@dchelimsky dchelimsky Dev: copy Gemfile.lock file to generated app 81ef9b0
@dchelimsky dchelimsky point to arel's 2-0-stable branch for rails 3-0-stable ab18f4b
@tjmcewan tjmcewan add namespaced-resource support to scaffold generator
- Closes #331.

e.g. `rails g scaffold admin/user name:string order:integer`
@dchelimsky dchelimsky Dev: generate nested resource for smoke test of generators fe24a1e
@dchelimsky dchelimsky Changelog 924a245
Commits on Apr 02, 2011
@andersonleite andersonleite adding rvmrc to gitignore 9ef3edc
@andersonleite andersonleite Remove unncessary before hook from example.
- Closes #348
Commits on Apr 03, 2011
@myronmarston myronmarston Removed unused let. 60ffa4b
@dchelimsky dchelimsky Prefix rspec w/ 'bundle exec' when running aruba-driven cukes cb5c0f5
@dchelimsky dchelimsky no need for ./ in 4aac27a
@dchelimsky dchelimsky revert ack to not copying lock file and running bundle install in the…
… generated app
Commits on Apr 04, 2011
@dchelimsky dchelimsky Dev: reworked the gemfile config needed to run against multiple versions
of Rails
@dchelimsky dchelimsky add travis config f8c86dd
@dchelimsky dchelimsky constrain to reasonable versions for ci af1102c
Commits on Apr 09, 2011
@dchelimsky dchelimsky docs 40d482b
@dchelimsky dchelimsky add gemfile for latest rails 17b7e0d
@dchelimsky dchelimsky Dev: establish connection earlier and more generally.
- supports running specs against rails-master
@dchelimsky dchelimsky run ci against rails 3.0.5, 3-0-stable, and master d823c8f
Commits on Apr 11, 2011
@dchelimsky dchelimsky git ignore .rbc files cc1c55e
@dchelimsky dchelimsky Support rspec/rails/mocks without the rest of the rails framework. 91ba131
@dchelimsky dchelimsky changes 0342607
Commits on Apr 15, 2011
@burtlo burtlo Transactions description
- Closes #321
Commits on Apr 16, 2011
@dchelimsky dchelimsky more doc tweaks d3f5e0b
@dchelimsky dchelimsky typo 5d838bb
@alindeman alindeman Fix error in generator name e077140
@alindeman alindeman Allow use of URL helpers even when using anonymous controller
- Closes #355.
- CLoses #339.
@dchelimsky dchelimsky Add thor task for installing bundle with rails-version-specific-gemfile aa1a079
@dchelimsky dchelimsky minor tweaks to previous commit 06517b0
@dchelimsky dchelimsky changelog 5967d4b
Commits on Apr 17, 2011
@alindeman alindeman Fix error in constant name. Closes #354 27b0cf2
@justinko justinko changelog 3c53e96
@dchelimsky dchelimsky Better handling of gemfile scenarios 08f5d4e
Commits on Apr 18, 2011
@dchelimsky dchelimsky prep for 2.6.0.rc1 cd45332
@dchelimsky dchelimsky comment aruba/cukes in Gemfile 9eaf924
@dchelimsky dchelimsky update changelog f440559
@dchelimsky dchelimsky don't depend on yourself, silly 421ff03
@dchelimsky dchelimsky bump to 2.6.0.rc2 e0d913f
@dchelimsky dchelimsky update the changelog 1039035
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
@dchelimsky dchelimsky Revert "Rework the build to make it more travis-friendly."
This reverts commit 023887f.
@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
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.
@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.
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
@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
@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
@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
@joelmoss joelmoss Relax the dependencies on rails gems to >= 3.0
- Closes #364.
@dchelimsky dchelimsky Dev: add the gems from the Gemfile generated by 'rails new ...' 69770e6
@dchelimsky dchelimsky prep for 2.6.0.rc5 ad77a8d