Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
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 Aug 28, 2011
@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
@dchelimsky dchelimsky bump relish version to ~> 0.5.0 46cb9f8
Commits on Oct 16, 2011
@dchelimsky dchelimsky config yard 2f8ea66
@dchelimsky dchelimsky cleanup and add some rdoc 6ab0bb6
@dchelimsky dchelimsky update changelog for 2.7.0 release 9ed59a5
@dchelimsky dchelimsky bump version to 2.7.0 90746f9
@dchelimsky dchelimsky fix formatting problems in the changelog 59a41f6
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.
412b38a
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
a5030df
@dchelimsky dchelimsky Merge pull request #458 from pda/master
Remove config.mock_with :rspec, avoid config-after-examples error.
a5c0ee0
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
c1c2f60
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.
559e8f2
@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
1699f66
@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
  RSpec::Matchers
- less opening classes/more includuing modules
5af9d7d
@dchelimsky dchelimsky constrain ammeter dependency to :test group
It was causing some trouble running generators when it was in the
development group as well.
40d3bf1
@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.
7b568eb
@dchelimsky dchelimsky require 'rspec/rails/matchers' to (temp) resolve circular dep between…
… rspec-rails' specs and ammeter
efcafc7
@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
1ec505d
@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).
402996e
@jasonmk jasonmk Check to see if the module we're actually working with is loaded (in …
…case only pieces of ActiveRecord are loaded).
08ed00a
@dchelimsky dchelimsky Merge pull request #467 from jkusar/master
Check to see that the necessary sub-modules are actually loaded before extending
ffdac58
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)
37da9b0
@dchelimsky dchelimsky Merge pull request #454 from liquid/master
Use to_param in scaffold spec templates
d05c3ef
@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.
eb08f7d
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.
e242279
@dchelimsky dchelimsky Implement method_missing on mock model's proxy object rather than
stubbing upon respond_to?

- #437
8a0a6f5
@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
2085462
@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
specs.

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

Document what actions are made available in an anonymous controller
b8b6f79
@dchelimsky dchelimsky Changelog and remove .intern (send doesn't care) c4df12e
@jwulff jwulff add description method to RSpec::Rails::Matchers::RoutingMatchers::Ro…
…uteToMatcher
6833410
Commits on Dec 21, 2011
@ndbroadbent ndbroadbent request.path_parameters 'controller' and 'action' keys should be symb…
…ols, since they are symbols in the real Rails environment.
511ad01
@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.
3efe8f9
@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…
…ription
cd57e56
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.
a10c402
@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
70c2301
@justinko justinko Merge pull request #479 from jwow313/master
Readme update for Capybara syntax
7616042
Commits on Jan 11, 2012
@ndbroadbent ndbroadbent Added cucumber test to ensure that controller.request.path_parameters…
… contains symbols for keys
bc98726
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
caa5830
@dchelimsky dchelimsky use ammeter from git (has fix for deprecation warnings on InstanceMet…
…hods)
c9b47d6
@dchelimsky dchelimsky mock_model(XXX).as_null_object.unknown_method returns self
- Fixes #488.
7fa15c4
@dchelimsky dchelimsky Merge pull request #473 from jwulff/add_description_to_route_to_matcher
Add description method to route_to matcher
d5d3dfb
@dchelimsky dchelimsky Changelog for #473.
Also aligned the example with others in the spec.
ea2be20
@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.
51893e6
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'
89d6ef1
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.
df0aa29
@dchelimsky dchelimsky Merge pull request #493 from yakko/no_more_repeating_webrat
this commented line should not be inside a loop
c7cc3cc
@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
ff96af6
Commits on Feb 12, 2012
@dchelimsky dchelimsky Generated view specs use different IDs for each attribute.
- Fixes #504.
88ed708
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
8398bb7
Commits on Feb 21, 2012
@mlineen mlineen Update README.md 6207edc
@justinko justinko Merge pull request #506 from mlineen/patch-1
Update README.md
a281271
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.
e5938b8
@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.
86eabe1
@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
@dchelimsky dchelimsky align gemspec with other rspec libs 5f9b860
@dchelimsky dchelimsky bump to 2.9.0.rc2 4850973
Commits on Mar 16, 2012
@dchelimsky dchelimsky require 'rspec/expectations' to ensure that 'should' is defined 5e1b8a2
Commits on Mar 17, 2012
@dchelimsky dchelimsky bump to 2.9.0 9f976cb
@dchelimsky dchelimsky Merge branch '2-9-maintenance'
* 2-9-maintenance:
  bump to 2.9.0
7935021
@dchelimsky dchelimsky dev: add a script to download ruby-debug-base19-0.11.26.gem and linec…
…ache19-0.5.13.gem to a local cache

[ci skip]
86a62dc
@justinko justinko Use Cucumber's 'step' method to remove deprecation warnings. ed5787d
@justinko justinko Use --skip-test-unit e833a27
@dchelimsky dchelimsky changlog formatting tweaks 6b7adaf
Commits on Mar 30, 2012
@martinsvalin martinsvalin Let local render_views override global setting
If render_views is enabled globally in the spec_helper, it clobbers attempts to disable it locally for specific examples due to the false || true logic.

Instead, only use the global setting if no local render_views was provided.
f7640ad
Commits on Mar 31, 2012
@justinko justinko Merge pull request #522 from martinsvalin/render_views
Let local render_views override global setting
7419039
@justinko justinko Use Hash#fetch 72b6d52
@justinko justinko Changelog for #522 002f1da
Commits on Apr 01, 2012
@nertzy nertzy Add Rails 3.2.3 to Travis CI matrix 74deef3
@justinko justinko Merge pull request #524 from nertzy/rails_3.2.3_in_travis
Add Rails 3.2.3 to Travis CI matrix
df4ef8a
@justinko justinko Dev: fix build by allowing mass assignment for an attribute b11800f
Commits on Apr 03, 2012
@dchelimsky dchelimsky remove obsolete guard against building gems in ruby 1.9.3 dbcdcf7
Commits on Apr 08, 2012
@dchelimsky dchelimsky use prepend_before for rails' test adapter
- Fixes #391.
- Needs to be released with or after addition of prepend_before to
  rspec-core.
47907b3
Commits on Apr 13, 2012
@justinko justinko typo [ci skip] 3562f8f
@jdelStrother jdelStrother Fix rendering deprecations in view specs
render(:template=>'new.erb') is now deprecated and should be render(:template=>'new', :handlers=>['erb']).  This patch takes the default template name supplied in the spec and breaks it up into its separate components before calling render().
656ff35
Commits on Apr 18, 2012
@justinko justinko Fix render_views for anonymous controllers on 1.8.7. Closes #525 10bba44
Commits on Apr 20, 2012
@dchelimsky dchelimsky route_to matcher captures ActionController::RoutingError as well as
Assertion failures.

- Fixes #530.
61e2ac1
Commits on Apr 21, 2012
@dchelimsky dchelimsky dev: update Gemfile f03065c
@dchelimsky dchelimsky Eliminate use of deprecated process_view_paths.
- Fixes #519.
ff6a9ff
@dchelimsky dchelimsky doc more changes in Changelog [ci skip] 3c09c4b
Commits on Apr 22, 2012
@dchelimsky dchelimsky align config files across rspec projects d691d05
@dchelimsky dchelimsky dev: align Gemfiles across rspec projects e1fd5b6
@dchelimsky dchelimsky Merge pull request #463 from ndbroadbent/fix_path_parameters
Change request.path_parameters keys to symbols to match real Rails environment
2987f7f
@dchelimsky dchelimsky Changelog for #463 [ci skip] 89da19c
@dchelimsky dchelimsky Merge pull request #529 from jdelStrother/render_args
Fix rendering deprecations in view specs
0336706
@dchelimsky dchelimsky Changelog for #529 [ci skip] 040f6a9
Commits on Apr 23, 2012
@dchelimsky dchelimsky ci: without --without development 7ce7d07
@dchelimsky dchelimsky fix cuke broken by #461 3ad5d8a
Commits on Apr 27, 2012
@dchelimsky dchelimsky minor Changelog tweak [ci skip] 4623ad1
Commits on Apr 28, 2012
@moonmaster9000 moonmaster9000 Fix typo in README (Articles -> Article) 70dfecd
@myronmarston myronmarston Merge pull request #532 from moonmaster9000/patch-1
Fix typo in README (Articles -> Article)
d0cbcb3
Commits on May 01, 2012
@dchelimsky dchelimsky update yard to 0.8 aea719d
Commits on May 03, 2012
@hardbap hardbap Update README.md with the latest version of rspec_rails. 2dc13e8
@hardbap hardbap Change it to 2.0 based on comments by @dchelimsky. 2e2bb32
@dchelimsky dchelimsky Merge pull request #533 from hardbap/patch-1
Update README.md with the latest version of rspec_rails.
b741057
Commits on May 04, 2012
@dchelimsky dchelimsky update changelog for 2.10 release c48da4c
@dchelimsky dchelimsky bump to 2.10.0 93e4eec
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
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)
be2afcd
Commits on Oct 14, 2012
@dchelimsky dchelimsky add CAPYBARA.md 288cd4d
@dchelimsky dchelimsky prep for 2.11.1 64aaaeb
@dchelimsky dchelimsky need to add Capybara.md to .yardopts b235fcf
@dchelimsky dchelimsky one more rename 0f38c85
@dchelimsky dchelimsky better capy integration docs 9af089c
@dchelimsky dchelimsky prep for 2.11.2 7d23257