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 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
Commits on May 25, 2011
@dchelimsky dchelimsky lock rake at ~> 0.9.0 7037b25
@dchelimsky dchelimsky back to 0.8.7 f8a6b93
@dchelimsky dchelimsky dev: add rdoc to gemfile d2a25bd
@dchelimsky dchelimsky dev: add generic 'thor gemfile:with' command to run bundle commands 02394e6
Commits on May 26, 2011
@dchelimsky dchelimsky bump to 2.6.1 72671f3
@dchelimsky dchelimsky credit fd253db
@dchelimsky dchelimsky ci: add 3.0.8.rc1 to build d3894ad
Commits on May 27, 2011
Lewis Marshall Fix #mock_model to enable stubbing of to_s 50d7024
Commits on May 29, 2011
@dchelimsky dchelimsky 3.0.8.rc2 a967b0b
Commits on May 30, 2011
@justinko justinko Merge pull request #381 from econsultancy/econsultancy-2011-05-27
[Fixes #380] Fix #mock_model to enable stubbing of to_s
43743f9
@justinko justinko User "thor gemfile:use", not "thor rails:use" 4ac10d8
@justinko justinko spacing 09b76dc
@justinko justinko Don't add instance methods if they are stubbed 4303e77
@justinko justinko clearer example descriptions 67bbae7
@dchelimsky dchelimsky ci: run against rails-3.0.8.rc3 301ca01
@justinko justinko spec the rest of the methods 8e784e8
@justinko justinko whoops, was running the spec wrong ee24a72
@dchelimsky dchelimsky inline the specs from the last shared group 34765e1
Commits on Jun 02, 2011
@dchelimsky dchelimsky ci: rails 3.0.8.rc4 bf8a853
@dchelimsky dchelimsky relish docs b4560eb
Commits on Jun 06, 2011
@dchelimsky dchelimsky doc tweaks a3b334b
@dchelimsky dchelimsky more doc tweaks 56bb408
Commits on Jun 07, 2011
@dchelimsky dchelimsky add doc about cookies in controller specs 82542e7
@dchelimsky dchelimsky update doc 551d902
Commits on Jun 08, 2011
@dchelimsky dchelimsky ci: rails 3.0.8 (final) and 3.1.0.rc2 d59b515
Commits on Jun 09, 2011
@dchelimsky dchelimsky ci: rails 3.0.9.rc1 and 3.1.0.rc3 6506f5a
@alexrothenberg alexrothenberg added generator specs for model_generator using the ammeter gem 60dac28
@justinko justinko Merge pull request #393 from alexrothenberg/with_generator_specs
added generator specs for model_generator using the ammeter gem
78790a2
@justinko justinko spacing bcfdbe5
Commits on Jun 10, 2011
@dchelimsky dchelimsky Revert "spacing"
This reverts commit bcfdbe5.
8f686bf
@dchelimsky dchelimsky Revert "Merge pull request #393 from alexrothenberg/with_generator_sp…
…ecs"

Not sure why yet, but this merge broke our spec suite.

This reverts commit 78790a2, reversing
changes made to 6506f5a.
2ff65a9
@dchelimsky dchelimsky ci: rails 3.1.0.rc4 and 3.9.0.rc3 902ceba
Commits on Jun 13, 2011
@dchelimsky dchelimsky ci: rails-3.0.9.rc5 632d20d
@dchelimsky dchelimsky dev: constrain file list in gemspec eb9f887
Commits on Jun 16, 2011
@dchelimsky dchelimsky ci: run against rails-3.0.9 (final) e0cd00c
Commits on Jun 20, 2011
@alexrothenberg alexrothenberg added generator specs for model_generator using the ammeter gem 83622b2
Commits on Jun 21, 2011
@dchelimsky dchelimsky ci: exclude local dev gems from travis bundle 548d8f6
@dchelimsky dchelimsky dev: exclude rcov tasks when using ruby 1.9 51cfcac
@justinko justinko spacing 11f5cda
@alexrothenberg alexrothenberg patch so ammeter and generator specs work with rails 3.1 171393d
@alexrothenberg alexrothenberg added a feature for testing a generator 511e8b2
Commits on Jun 22, 2011
@justinko justinko Merge pull request #397 from alexrothenberg/with_generator_specs
Follow up to #393: added generator specs for model_generator using the ammeter gem
9b8d14d
@justinko justinko singularize feature filename 53147d6
@justinko justinko spacing fff2a23
@justinko justinko dev change cf044fc
Commits on Jun 23, 2011
@dchelimsky dchelimsky ci: remove obsolete config c7ad31d
@dchelimsky dchelimsky bump to cucumber 1.0.0 5c07dea
@alexrothenberg alexrothenberg specs for all the rspec-rails generators 82352cb
Commits on Jun 24, 2011
@justinko justinko Merge pull request #402 from alexrothenberg/more_generator_specs
specs for all the rspec-rails generators
0f62775
@justinko justinko should-less 327eecd
@bjnord bjnord #403 (comment)
Per justinko, removed ".to_s" from all ":id => <%= file_name %>.id" for consistency.
302a14c
@alexrothenberg alexrothenberg removing features/generator_specs as it tests ammeter functionality a…
…nd does not belong in rspec-rails
fcfb1e6
@dchelimsky dchelimsky Merge pull request #405 from alexrothenberg/removing_generator_feature
remove features/generator_specs as it tests ammeter functionality
0bfa427
@justinko justinko Merge pull request #404 from bjnord/patch-1
Patch for controller spec generator :id inconsistency (#403)
9dae6f9
Commits on Jun 25, 2011
@dchelimsky dchelimsky move Changelog.md to project root bda362b
@dchelimsky dchelimsky changelog 18c02e2
@dchelimsky dchelimsky ci: use https for travis badge 3018843
@dchelimsky dchelimsky dev docs 0a256fc
@dchelimsky dchelimsky ci: bump aruba timeout to 15 seconds (srsly?) a1604b1
@dchelimsky dchelimsky Fix bug caused by fixture_file_upload reading from ActionController::…
…TestCase instead of self.class.

- This should also be fixed in rails-3.1
  - rails/rails#1861
- Fixes #252
9ad14ae
Commits on Jun 26, 2011
@justinko justinko better example description for generated controllers 465cb3e
Commits on Jun 28, 2011
@josevalim josevalim Run all spec/*_spec.rb files instead of just the ones listed in the d…
…irectory.
9290c03
@justinko justinko Merge pull request #407 from josevalim/patch-1
Run all spec/*_spec.rb files instead of just the ones listed in the direc
097cf62
Commits on Jul 03, 2011
@dchelimsky dchelimsky Changelog 44f4988
@dchelimsky dchelimsky support nested resource in view spec generator
- Fixes #409.
1f2f619
@dchelimsky dchelimsky Changelog fc75bc7
Commits on Jul 08, 2011
@dchelimsky dchelimsky doc tweaks 20f3780
Commits on Jul 11, 2011
@lucascaton lucascaton Adjusts in README file 62ad935
@dchelimsky dchelimsky Merge pull request #412 from lucascaton/master
Adjusts in README file
95dac95
Commits on Jul 29, 2011
@dchelimsky dchelimsky ci: bump 3.1.0 to rc5 and add 3-1-stable af9ba4c
Commits on Aug 03, 2011
@alanshields alanshields Provide a better example of how to stub a helper method in a view spec
When I upgraded to Rails 3.0.9 I ran into an issue where
controller.singleton_class.class_eval was leaving behind cruft for
other tests to run into.

We exploit the fact that helper methods are imported into the view class
to stub those helpers.
6878df5
@justinko justinko Merge pull request #420 from alanshields/stub-helper
Better example of how to stub a helper method in a view.
9fef2f5
Commits on Aug 05, 2011
@dchelimsky dchelimsky ci: add rails 3.0.10 6ca1238
Commits on Aug 15, 2011
@dchelimsky dchelimsky require 'rspec/autorun' in generated spec_helper
- Closes #424
24a3117
Commits on Aug 16, 2011
@lenny lenny Re-introduced :bypass_rescue in ControllerExampleGroup
- Closes #426
e373d79
@dchelimsky dchelimsky override method via extend (avoids warning from Ruby) a550d08
@dchelimsky dchelimsky add spec for bypass_rescue e028626
@dchelimsky dchelimsky rename feature to bypass_rescue and tweak it a bit b4da358
@dchelimsky dchelimsky Changelog b306f55
Commits on Aug 17, 2011
@alindeman alindeman Infer base class of anonymous controllers
- Closes #421, #427
a2caa56
@dchelimsky dchelimsky beef up anonymous controller doc 58e89df
Commits on Aug 18, 2011
@alindeman alindeman [Fixes #398] ActiveRecord::Relation can use =~ matcher 028a174
Commits on Aug 19, 2011
@alindeman alindeman Moving ar_classes to spec/support 311e51f
@alindeman alindeman Add spec coverage for ActiveSupport::Relation =~ matcher 0a82f91
@alindeman alindeman Only register operator if ActiveRecord is defined 05a2b6c
@justinko justinko Merge pull request #428 from alindeman/ar_relation_match_array
[Fixes #398] ActiveRecord::Relation can use =~ matcher
8dfd952
@justinko justinko changelog 99526fd
Commits on Aug 23, 2011
@dchelimsky dchelimsky bump rails 3.0.10 to the production release and 3.1.0 to rc6 60312d5
Commits on Aug 28, 2011
@marcweil marcweil Edited gemfiles/base.rb via GitHub 0130c2f
@marcweil marcweil Fix deps so things actually work. f3e6d41
@marcweil marcweil Parse query parameters and pass them to assert_recognizes. 096aaab
@marcweil marcweil Add case in spec for dealing with multiple query params. c94c1a8
@dchelimsky dchelimsky Merge pull request #431 from marcweil/master
Parse query parameters and pass them to assert_recognizes
eafdae4
@dchelimsky dchelimsky let Rack::Utils parse the query string in route_to matcher 736e496
@dchelimsky dchelimsky changes ceeed7a
Commits on Aug 29, 2011
@marcgg marcgg Use Github Flavored Markdown d023586
@dchelimsky dchelimsky Merge pull request #432 from marcgg/colored-readme
Use Github Flavored Markdown for the README
cd61270
@dchelimsky dchelimsky Revert "Use Github Flavored Markdown"
Nice idea, but it breaks display in other environments.

This reverts commit d023586.
99ba346
Commits on Aug 31, 2011
@dchelimsky dchelimsky ci: run against production release of rails 3.1.0 2008531
Commits on Sep 01, 2011
@alindeman alindeman Fix mistake in check to see if ActiveRecord is defined 38c0faa
@justinko justinko Merge pull request #434 from alindeman/ar_relation_match_array
Fix mistake in check to see if ActiveRecord is defined
c7388eb
Commits on Sep 06, 2011
@dchelimsky dchelimsky Define primary_key method on class generated by mock_model("WithAStri…
…ng").

- Closes #435.
cf3f04c
@dchelimsky dchelimsky use rake 0.9.2 346b0a2
@dchelimsky dchelimsky dev: no need to update what we just loaded 9a92b75
Commits on Sep 23, 2011
@andreimaxim andreimaxim Use the correct Travis status icon URL 5dce44c
@justinko justinko Merge pull request #444 from xhr/master
Use the correct Travis CI status image URL
9805468
@justinko justinko Fixed incorrect documentation for stub_model. Thanks Evgeniy Dolzhenko. 1b8c886
Commits on Oct 02, 2011
@dchelimsky dchelimsky ci: add journey to gemfile for rails master 68cb4ea
@dchelimsky dchelimsky dev: add association IDs for rails 3.2 d85e787
Commits on Oct 04, 2011
@dchelimsky dchelimsky ci: add rails 3.1.1 and ruby 1.9.3 to travis config 45aca2a
Commits on Oct 06, 2011
@dchelimsky dchelimsky ci: bump rails 3.1.1 to rc3 5649a36
Commits on Oct 09, 2011
@dchelimsky dchelimsky ci: run against rails 3.1.1 final 4a1cb78
@dchelimsky dchelimsky bump to 2.7.0.rc1 aea643f