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 Jul 15, 2011
@alanshields alanshields Document what actions are made available in an anonymous controller
It's a somewhat long test, but it shows what calls you can make and
what calls you cannot make on an anonymous controller. I ran into this
issue myself when I thought that all actions were routed.

They weren't.

Written on time paid for by
Commits on Oct 20, 2011
@liquid liquid Fix typo in the upgrade instructions. 4a0a855
@liquid liquid Use .to_param instead of .id in controller spec templates.
Action Pack uses to_param for constructing an URL to objects. The default implementation returns this record’s id as a String. This way even if to_param is overridden in an ActiveRecord object, the controller spec templates are going to still work.
Commits on Oct 25, 2011
@justinko justinko Allow generator specs to work with --default_path 1416314
@justinko justinko Set default order to :random b6022dc
@justinko justinko Fix order-dependent spec 0b9b153
@justinko justinko Don't match on rake loaded files 364fbb0
Commits on Oct 29, 2011
@dchelimsky dchelimsky align config extensions with changes to rspec-core planned for 2.8 48d4cd3
Commits on Oct 31, 2011
@pda pda Removed unnecessary "config.mock_with :rspec" from spec_helper.rb
This statement configures RSpec to do what it would do anyway, and
triggers errors regarding RSpec.configure being called after examples
have been defined.

See: rspec/rspec-rails#371
See: rspec/rspec-core#455
@dchelimsky dchelimsky Merge pull request #458 from pda/master
Remove config.mock_with :rspec, avoid config-after-examples error.
Commits on Nov 01, 2011
@dchelimsky dchelimsky dev: ruby-debug19 versions 3ba3a49
@dchelimsky dchelimsky fix bug where namespaced generators were falling down 1b1c181
Commits on Nov 06, 2011
@dchelimsky dchelimsky changelog 2fa4bc7
@dchelimsky dchelimsky bump to 2.8.0.rc1 b8b7dd9
Commits on Nov 08, 2011
@deadlyicon deadlyicon restored the ability to use method missing matchers like be_blank or …
…be_true in before blocks for routing example groups
Commits on Nov 09, 2011
@dchelimsky dchelimsky update License and/or authors in gemspec b50073f
@dchelimsky dchelimsky update email addy and homepage in gemspec 08ceb6f
Commits on Nov 20, 2011
@dchelimsky dchelimsky rdoc 130c94f
Commits on Nov 21, 2011
@dchelimsky dchelimsky dev: much simpler management of multiple gemfiles 5687b8d
@dchelimsky dchelimsky ci: the last commit broke our travis config - going for all 3.1.1 for
now but need to revisit.
@dchelimsky dchelimsky ci: check an env variable before .rails-version 342313f
@dchelimsky dchelimsky ci: move file refs 012cee7
@dchelimsky dchelimsky ci: 3.1.3 568030e
@dchelimsky dchelimsky ci: point rails master build at arel on github b80af68
@dchelimsky dchelimsky ci: rails 3.0.11 874f047
@dchelimsky dchelimsky change describes (deprecated) to described_class c0cfb51
@dchelimsky dchelimsky refactor a couple of matchers to use rspec-expectation's new BaseMatcher f963a5b
@dchelimsky dchelimsky doc: remove comment about Capyabara matchers not being available in v…
…iew specs

- #302
@dchelimsky dchelimsky dev: reference 3.1.3 instead of 3.1.1 af3ff6e
@dchelimsky dchelimsky convert remaining matchers to classes (faster) and document them ffd6c07
Commits on Nov 22, 2011
@dchelimsky dchelimsky cleaner scoping
- def classes/modules in RSpec::Rails::Matchers instead of
- less opening classes/more includuing modules
@dchelimsky dchelimsky constrain ammeter dependency to :test group
It was causing some trouble running generators when it was in the
development group as well.
@dchelimsky dchelimsky dev: don't clobber the Gemfile.lock file
That gets handled by running "thor version:use x.x.x" and it is
inconvenient to have to install the bundle every time we're trying to
clean up generated files.
@dchelimsky dchelimsky require 'rspec/rails/matchers' to (temp) resolve circular dep between…
… rspec-rails' specs and ammeter
@dchelimsky dchelimsky more rdoc 620b7f3
@dchelimsky dchelimsky small rdoc tweak e26fb34
@dchelimsky dchelimsky rdoc: correct indentation helps (markdown) 78c7548
Commits on Nov 23, 2011
@dchelimsky dchelimsky git ignore DS_Store 2fbef9d
Commits on Nov 24, 2011
@dchelimsky dchelimsky BaseMatcher now implements match_unless_raises b24cc69
Commits on Nov 25, 2011
@dchelimsky dchelimsky dev: hack the Gemfile to print instructions for ruby-debug-base19 and…
… linecache19 on ruby-1.9.3
@dchelimsky dchelimsky ci: don't warn about ruby-debug-base19 and linecache19 in ci 9b72cf9
Commits on Nov 26, 2011
@dchelimsky dchelimsky dev: move dev-env gems to Gemfile-custom.sample 3b7452b
Commits on Dec 01, 2011
@jasonmk jasonmk Check to see if the module we're actually working with is loaded (in …
…case only pieces of ActiveRecord are loaded).
@jasonmk jasonmk Check to see if the module we're actually working with is loaded (in …
…case only pieces of ActiveRecord are loaded).
@dchelimsky dchelimsky Merge pull request #467 from jkusar/master
Check to see that the necessary sub-modules are actually loaded before extending
Commits on Dec 02, 2011
@dchelimsky dchelimsky add DEV-README 49d7ae7
@dchelimsky dchelimsky add license to gemspec (and consequently the gem) c954554
Commits on Dec 04, 2011
@dchelimsky dchelimsky Merge pull request #460 from deadlyicon/patch-1
define @routes on demand instead of in before hook (ensures they are present for before hooks that might run earlier)
@dchelimsky dchelimsky Merge pull request #454 from liquid/master
Use to_param in scaffold spec templates
@dchelimsky dchelimsky use github-flavored-markdown in the readme 1bec8ff
@dchelimsky dchelimsky include changelog and license in generated rdoc c5c576b
@dchelimsky dchelimsky Revert "restored the ability to use method missing matchers like be_b…
…lank or be_true in before blocks for routing example groups"

This reverts commit c1c2f60.

Unfortunately, there is code outside rspec's control that refers
directly to the instance variable, so this change ends up breaking more
than it fixes.

- Reopens #460.
Commits on Dec 05, 2011
@dchelimsky dchelimsky rdoc 9bf3e32
Commits on Dec 07, 2011
@iafonov iafonov Stub attribute accessor after respond_to? call on mocked model. Fixes #… 9a23ba1
@dchelimsky dchelimsky Changelog for #437 88137f2
@dchelimsky dchelimsky rdoc for bypass_rescue 4c7fd73
Commits on Dec 08, 2011
@iafonov iafonov Take 2 on stubbing attribute accessor after respond_to? call on mocke…
…d model. Fixes #437.
@dchelimsky dchelimsky Implement method_missing on mock model's proxy object rather than
stubbing upon respond_to?

- #437
@thejamespinto thejamespinto Restricted controllers tested with more readability 7b377c1
@dchelimsky dchelimsky Changelog for #464 ad5e580
@dchelimsky dchelimsky Consolidate rdoc for example groups to README 80febb5
@dchelimsky dchelimsky more rdoc cleanup c1f0eab
@dchelimsky dchelimsky rdoc 0e6b185
Commits on Dec 20, 2011
@dchelimsky dchelimsky Move instance methods from InstanceMethods modules to stop deprecation
warnings from ActiveSupport-3.2
@dchelimsky dchelimsky ci: add rails-3.2.0.rc1 8b0eb72
@dchelimsky dchelimsky prep for 2.8.0.rc2 13b699f
@dchelimsky dchelimsky Remove handler and template engine from file names in generated view

- This eliminates deprecation warnings from rails 3.2, and still works
  with earlier 3.x versions.
@dchelimsky dchelimsky changelog for previous commit 1ac8709
@dolzenko dolzenko Ensure namespaced helpers are included automatically
-- Closes #446.
@dchelimsky dchelimsky Merge pull request #415 from alanshields/document-anonymous-controlle…

Document what actions are made available in an anonymous controller
@dchelimsky dchelimsky Changelog and remove .intern (send doesn't care) c4df12e
@jwulff jwulff add description method to RSpec::Rails::Matchers::RoutingMatchers::Ro…
Commits on Dec 21, 2011
@dchelimsky dchelimsky beef up README section on Request Specs 6a87a0b
@dchelimsky dchelimsky ci: add rails 3-2-stable and fix support for rails master
- Rails master version is now 4.0.0.beta.
- temp point ammeter at dchelimsky/ammeter to handle rails 4.
@dchelimsky dchelimsky ci: rails 4 requires 1.9.3 320ea0f
Commits on Dec 22, 2011
@jwulff jwulff Add spec RSpec::Rails::Matchers::RoutingMatchers::RouteToMatcher desc…
Commits on Jan 05, 2012
@dchelimsky dchelimsky bump rails version to 3.2.0.rc2 ff79b8e
@dchelimsky dchelimsky bump to 2.8.0 0fd5bf4
@dchelimsky dchelimsky Explicitly stub valid? in stub_model.
This fixes a bug in stub_model that appeared with the rails-3.2.0.rc2
release, which means that people who use stub_model will have to upgrade
to the next rspec-rails release (2.8.1) when they upgrade to rails-3.2.
@dchelimsky dchelimsky Changelog for previous commit and bump to 2.8.1 8ed140d
Commits on Jan 09, 2012
@boringusername99 boringusername99 Capybara uses :text, not :content as the option to have_selector. Any…
…thing passed via :content is ignored entirely, leading to lots of incorrectly passing tests. The docs should reflect this, as this is pretty confusing. See this Capybara issue for more details: jnicklas/capybara#525
@justinko justinko Merge pull request #479 from jwow313/master
Readme update for Capybara syntax
Commits on Jan 12, 2012
@wfarr wfarr Update for rspec-expectations compatibility. 98be115
Commits on Jan 19, 2012
@dchelimsky dchelimsky Merge pull request #482 from wfarr/master
Updates for compatibility with rspec-expectations
@dchelimsky dchelimsky use ammeter from git (has fix for deprecation warnings on InstanceMet…
@dchelimsky dchelimsky mock_model(XXX).as_null_object.unknown_method returns self
- Fixes #488.
@dchelimsky dchelimsky Merge pull request #473 from jwulff/add_description_to_route_to_matcher
Add description method to route_to matcher
@dchelimsky dchelimsky Changelog for #473.
Also aligned the example with others in the spec.
@dchelimsky dchelimsky dev: add -w when running rake spec 2ffa9fb
@dchelimsky dchelimsky Funny thing, but turning on warnings produces a bunch of warnings. Mo…
…stly gone now.
Commits on Jan 21, 2012
@reidreid46 reidreid46 Fix method name type 'click_buton' 03a2f6f
@dchelimsky dchelimsky Merge pull request #490 from reidreid46/master
Fix typo in readme: 'click_buton' to 'click_button'
Commits on Jan 24, 2012
@dchelimsky dchelimsky ci: run against rails 3.2.0 acfe944
@thejamespinto thejamespinto this commented line should not be inside a loop 4ca7614
@dchelimsky dchelimsky Use .inspect on hashes in descriptions for Ruby 1.8.7.
- #473.
@dchelimsky dchelimsky Merge pull request #493 from yakko/no_more_repeating_webrat
this commented line should not be inside a loop
@dchelimsky dchelimsky ci: point Gemfile at git for journey gem for rails 3-2-stable 53644fc
Commits on Jan 27, 2012
@dchelimsky dchelimsky ci: rails 3.2.1 50a27f2
Commits on Feb 01, 2012
@dchelimsky dchelimsky remove rendering engine and mime type from calls to describe and rend…
…er in docs and cukes
Commits on Feb 12, 2012
@dchelimsky dchelimsky Generated view specs use different IDs for each attribute.
- Fixes #504.
Commits on Feb 13, 2012
@justinko justinko Use #next 1e2ac19
Commits on Feb 14, 2012
@dchelimsky dchelimsky ci: experiment with new travis feature to allow failures when running…
… against dev branches of rails
Commits on Feb 21, 2012
@mlineen mlineen Update 6207edc
@justinko justinko Merge pull request #506 from mlineen/patch-1
Commits on Feb 27, 2012
@dchelimsky dchelimsky ci: add rails-3.2.2.rc1 c873d34
@dchelimsky dchelimsky Make specs about messages more tolerant of inconsistent ordering char…
…acteristics of different rubies.
@dchelimsky dchelimsky ci: extend aruba timeout to 30 secs acef5dc
Commits on Mar 02, 2012
@dchelimsky dchelimsky ci: run against released rails-3.2.2 4f747d7
Commits on Mar 07, 2012
@dchelimsky dchelimsky ci: bump to latest rails patch releases d05b9a8
@Antiarchitect Antiarchitect Make rspec to copy schema structure if schema format is :sql. 6d726b5
Commits on Mar 08, 2012
@justinko justinko Merge pull request #517 from Antiarchitect/patch-1
Make rspec to copy schema structure if schema format is :sql.
@justinko justinko changelog ddccef1
@justinko justinko Use name instead of handle 46a1a60
Commits on Mar 11, 2012
@dchelimsky dchelimsky dev: upgrade Cucumber, Aruba and ZenTest 4bc0843
Commits on Mar 12, 2012
@dchelimsky dchelimsky bump to 2.9.0.rc1 a52573e