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 Feb 10, 2014
@alindeman alindeman Changelog [ci skip] ee29d93
@alindeman alindeman Merge pull request #924 from rspec/dont_assume_root_controller_is_app…
…lication_controller

Don't assume presence of ApplicationController for anonymous controllers.
2a44340
@alindeman alindeman Includes call to check version and raise error if not satisfied 607e2c1
@alindeman alindeman Attempts to resolve circular dependency loading issue in Rails 4.0.x 75d0421
@alindeman alindeman Merge branch 'capybara_version_required' 3fc1edc
@alindeman alindeman Changelog [ci skip] a552789
Commits on Feb 17, 2014
@yujinakayama yujinakayama Require `rspec/collection_matchers` by default bad9492
@JonRowe JonRowe Merge pull request #935 from yujinakayama/require-collection_matchers
Require `rspec/collection_matchers` by default
ff76807
Commits on Feb 18, 2014
@myronmarston myronmarston Add release notes for 2.99.0.beta2.
[ci skip]
9a8c3ef
@myronmarston myronmarston Ignore bundle dirs.
[ci skip]
cac568c
@myronmarston myronmarston Update changelog for 3.0.0.beta2 release. [ci skip] bbed599
@myronmarston myronmarston Release 3.0.0.beta2 378d981
@myronmarston myronmarston Prepare changelog for 3.0.0.rc1 development. e03743f
Commits on Feb 19, 2014
@myronmarston myronmarston Improve changelog.
- Forward port 2.14.1 release notes.
- "full changelog" => "Full Changelog"
- Rearrange sections in order of importance for
  consistency with other rspec libs.
b9000a1
Commits on Feb 23, 2014
@JonRowe JonRowe load rspec support helpers ef0c647
@JonRowe JonRowe remove redefined method errors e601588
@JonRowe JonRowe active model lint can override methods when testing, we can safely ig…
…nore this warning
13e2211
@JonRowe JonRowe involve a warning by nesting contexts... 126de54
@JonRowe JonRowe remove a warning by defined? check 145ec80
@JonRowe JonRowe silence a warning caused by rails 8e2bafd
@JonRowe JonRowe avoid warning internally in rails 1bb9755
@JonRowe JonRowe convert stub_chain to expect 9dc3796
@JonRowe JonRowe supress I18 warning 9eb7063
@JonRowe JonRowe remove 1.8.7 regexp warnings a643243
@JonRowe JonRowe Merge pull request #892 from rspec/remove_warnings
Remove warnings from spec run
ac7519f
Commits on Feb 25, 2014
@JonRowe JonRowe remove test files from gemspec to speed up dl/s 174912c
@soulcutter soulcutter Merge pull request #942 from rspec/smaller-built-gem-size
Don't include any test files in the gem.
a3affe3
Commits on Feb 26, 2014
@JonRowe JonRowe refactor rake task 1e58eff
@JonRowe JonRowe update generator for 4.1 aa5c5f7
@JonRowe JonRowe update rake task to skip task on 4.1 b8680f9
Commits on Feb 27, 2014
@JonRowe JonRowe Merge pull request #946 from rspec/deal_with_rails_41_rake_task
Update test requirements for 4.1
10ab4bf
@JonRowe JonRowe refactor our task to set rails env 3fae486
Commits on Mar 03, 2014
@JonRowe JonRowe Merge pull request #945 from rspec/set_rails_env_to_test_for_consistency
Set RAILS_ENV to test for consistency.
bf8b1e9
@thomas-holmes thomas-holmes Remove mock_model and stub_model from rspec-rails
Some tests still fail without them as I have not yet figured out
a good way to fix them yet. View scaffold generators are also
currently broken.

rspec/rspec-rails#894
29c1758
@thomas-holmes thomas-holmes Update generators and tests to use doubles/actual models 6044ecd
@thomas-holmes thomas-holmes Update changelog 553d47e
@thomas-holmes thomas-holmes Update extracted game name in changelog to rspec-activemodel-mocks 3b9cee8
@alindeman alindeman Small cleanups for #902 af22944
@alindeman alindeman This change will be released with rc1 8e9081a
@alindeman alindeman Merge branch 'thomas-holmes-remove-mocks' a8eee18
Commits on Mar 12, 2014
@JonRowe JonRowe add 4.1.0.rc1 to travis.yml in prep for 4.1.0 942c415
@JonRowe JonRowe update install generator spec to include 4.1 scenario 3b4a78d
Commits on Mar 13, 2014
@JonRowe JonRowe Merge pull request #951 from rspec/add_rc_1
Prep for Rails 4.1.0
5d22611
Commits on Mar 15, 2014
@myronmarston myronmarston Update to deal with rspec-core :example_group metadata changes. 5dcd503
Commits on Mar 16, 2014
@myronmarston myronmarston Merge pull request #954 from rspec/address-rspec-core-changes
Update to deal with rspec-core :example_group metadata changes.
796671d
@cupakromer cupakromer Ruby 2.1 has deprecated File.exists 41c9095
@JonRowe JonRowe Merge pull request #955 from cupakromer/file-exists-deprecated
Ruby 2.1 has deprecated File.exists
38a8188
Commits on Mar 19, 2014
@rrrene rrrene Add docs badge to README c6ba725
@soulcutter soulcutter Merge pull request #959 from rrrene/patch-1
Add docs badge to README
5d04da8
@nextmat nextmat Improve render note to be more obvious, provide alternatives. 0d8113b
Commits on Mar 21, 2014
@JonRowe JonRowe Merge pull request #960 from nextmat/emphasize_render_note
Improve render note to be more obvious, provide alternatives.
0b3507b
@JonRowe JonRowe cleanup after #960
[skip ci]
371b108
Commits on Mar 22, 2014
@alindeman alindeman Bumps Rails versions e9591b1
@alindeman alindeman Also bumps the default version of Rails to 4.0.4 f309720
@alindeman alindeman Explicitly declare the types of specs 539c3d9
@alindeman alindeman Bumps ammeter to RSpec 3-compatible version
Fixes #961
ed7188d
Commits on Mar 23, 2014
@alindeman alindeman Merge pull request #966 from rspec/ammeter
Bumps ammeter to RSpec 3-compatible version
fcc74ca
@xaviershay xaviershay Extract infer file type code into own file. d2d99f4
@xaviershay xaviershay Enable rspec/rails to be loaded via rspec/rails/without_filetype_infe…
…r to allow opt-out of that behaviour.
f4b6ffd
@xaviershay xaviershay Merge pull request #969 from rspec/issue-662-2
Internal refactoring to enable opt-out of infer filetype behaviour
38ef324
@alindeman alindeman Switches back to mainline rails/rails repository 02b4aaa
@alindeman alindeman Merge branch 'rails_4_1' 4cf42bf
@alindeman alindeman Switches back to mainline ammeter 6850f0c
Commits on Mar 27, 2014
@olleolleolle olleolleolle Doc: "infers controller action" heading
Copypasta nitpick.
715af88
@JonRowe JonRowe Merge pull request #974 from olleolleolle/master
Doc: "infers controller action" heading
598c90c
Commits on Mar 28, 2014
@rosenfeld rosenfeld Fix specs
RSpec.configuration= is no longer defined.
7ea0ba9
@rosenfeld rosenfeld Ensure the original configuration is restored in with_isolated_config 60b5040
Commits on Mar 29, 2014
@myronmarston myronmarston Merge pull request #975 from rosenfeld/fix-specs
Fix specs
3d5a038
Commits on Mar 30, 2014
@myronmarston myronmarston Make Gemfile default the rails version more intelligently. c7a75d4
@JonRowe JonRowe Merge pull request #977 from rspec/fix-gemfile
Make Gemfile default the rails version more intelligently.
a32b910
Commits on Apr 07, 2014
@alexrothenberg alexrothenberg use ammeter 1.0.0 gem as it is now compatible with rspec 3 & 2 bbab706
@JonRowe JonRowe Merge pull request #986 from alexrothenberg/use-ammeter-1.0
use ammeter 1.0.0 gem as it is now compatible with rspec 3 & 2
3d63b16
Commits on Apr 14, 2014
@tiwatson tiwatson Switched Rack::Utils::parse_query to Rack::Utils::parse_nested_query 7861795
Commits on Apr 20, 2014
@xaviershay xaviershay Switch inferring file type by location to opt-in rather than always on. 0223ebd
Commits on Apr 21, 2014
@andyw8 andyw8 POST with invalid params should stub :update instead of :save
I noticed a inconsistency in the generated controller scaffold.

The spec for valid params expects a call to `update`, but the spec for invalid params expects a call to `save`. Only 'update' is used with the controller action.

I assume this only worked because the Rails implementation of `update` calls `save` within the implementation at some point?
1cf2072
@myronmarston myronmarston Merge pull request #970 from rspec/issue-662
Make filetype infer opt-in
041f542
@JonRowe JonRowe Merge pull request #1000 from andyw8/patch-1
POST with invalid params should stub :update instead of :save
e1d24ed
@JonRowe JonRowe changelog for #1000 98398d5
Commits on Apr 22, 2014
@myronmarston myronmarston Centralized config API extensions into a method.
This lets us re-use that method when we isolate
config in our specs.
33c3c73
@myronmarston myronmarston Improve example group mixin testing.
- Use a shared example group instead of a
  matcher. There are many more aspects to test
  than just one matchers worth.
- Rather than stubbing the metadata, actually
  write out spec files in an appropriate directory.
- Add coverage for `spec/api` mapping to `:request` specs.
2fec960
@myronmarston myronmarston Fix spec type inference.
- In #970 we added `infer_spec_type_from_file_location!` but forgot
  to remove the code in `lib/rspec/rails/configuration.rb` that
  made it always infer - so the opt-in API was there but it
  was always enabled. Here I've made it truly opt-in.
- The logic of `infer_spec_type_from_file_location!` also setup
  the helper module inclusion via explicit `:type` metadata but
  was only intended to setup the implicit mapping of spec file
  location to type.  Here I've made the module inclusion via
  `:type` always work w/o an explicit config option needed to
  enable it.
- We used to mutate the `:type` metadata on inclusion of the helper
  module, but this caused bugs such as #825. The problem is that
  rspec-core uses a raw hash for the metadata and doesn't re-apply
  filtering/inclusion logic when the metadata hash is mutated.
  Instead, we use a new explicit `define_derived_metadata` API.

Fixes #825 and closes #829.
0387ff2
@myronmarston myronmarston Stop mutating metadata.
There's no need to anymore, and it created some surprising
bugs (such as #825: `before(:all)` hooks would not properly
be applied because they were registered before the modules
were included).
7971bef
@myronmarston myronmarston No need to mutate metadata for `render_views` state.
Mutating metadata is problematic so using an ivar is better.

Also, remove a deprecated API while we're at it.
7f3032e
@myronmarston myronmarston Don't mutate `described_class` metadata.
Just set the controller class instead. Mutating
metadata has some odd edge case bugs (as rspec-core
doesn't update it's filters/hooks/etc when metadata
is mutated), so it's best to avoid it.
b458d21
@myronmarston myronmarston No need to infer spec type in our spec_helper. b03ad1e
@myronmarston myronmarston Deal with odd 1.9.2 warning on Travis. 3de5975
@myronmarston myronmarston Update changelog.
[ci skip]
88efc45
@myronmarston myronmarston Merge pull request #1002 from rspec/without-metadata-mutation
Fix spec type inferrence
fa2cb0a
Commits on Apr 23, 2014
@myronmarston myronmarston Remove ZenTest -- it's not needed for rspec-rails anymore. 68efba5
@myronmarston myronmarston Remove rspec-collection_matchers code.
rspec-collection_matchers provides all this functionality now.
a25e62e
@JonRowe JonRowe Merge pull request #1005 from rspec/collection-matchers-removals
Collection matchers removals
77318ed
Commits on Apr 27, 2014
@cupakromer cupakromer Remove remaining vendored `webrat`. b017b81
Commits on Apr 28, 2014
@cupakromer cupakromer Merge pull request #1011 from rspec/remove-webrat
Remove remaining vendored `webrat`.
82e0960
@potomak potomak Fix scaffold view generator templates for reference attributes
Rails generates field with an _id suffix for reference attributes, see
https://github.com/rails/rails/blob/master/railties/lib/rails/generators/erb/scaffold/templates/_form.html.erb#L24-L30

This commit should fix this case by using attribute.column_name instead of
attribute.name as used by the Rails generator template.
b6b3663
@rosenfeld rosenfeld Remove dependency on activemodel
This dependency has been introduced by John Firebaugh in commit 4549965 because lib/rspec/rails/mocks.rb required it.

But this file was removed in commit 29c1758.

Currently rspec-rails will check for defined?(::ActiveModel) before patching/extending it.

The dependency on activemodel will install unnecessary gems for some applications and will also trigger some bugs in Bundler which would prevent pre releases of railties to be installed with rspec-rails.
0bf292d
@cupakromer cupakromer Merge pull request #973 from rosenfeld/patch-2
Remove dependency on activemodel
480b173
Commits on Apr 30, 2014
@potomak potomak Invoke #column_name when available, use #name otherwise
Thanks @cupakromer for the suggestion

Note: include tests only for Rails >= 4.0.0
ffde669
Commits on May 01, 2014
@potomak potomak Setup local variable for attribute name; simpler check for Rails version 306f8e5
@cupakromer cupakromer Remove workaround from cff0228. 811cdbe
@cupakromer cupakromer Apply temp patch for Travis, RVM, and Ruby 2.1.0 ad84a1a
@cupakromer cupakromer Add Ruby 2.1.x and Rails 4.1.0 proper.
Use 2.1 fuzzy matching.
b14d897
@cupakromer cupakromer Attempt to force MRI 1.8.7 08a675b
Commits on May 02, 2014
@cupakromer cupakromer Add issue links for recent changes. 5804f12
@cupakromer cupakromer Merge pull request #937 from potomak/fix-scaffold-view-generator-temp…
…lates

Fix scaffold view generator templates for reference attributes in Rails 4.x
50dcf7f
@cupakromer cupakromer Merge pull request #1015 from rspec/fix-2-1-0-build
Update `.travis.yml` to workaround CI issues.
40aa2a0
@cupakromer cupakromer Document the `have_http_status` matcher.
Outline the intended use cases for the `have_http_status` matcher:

- It is designed to work of "response" objects
- It should work with controller, request, and feature specs
- It allows checking against:
  - Specific numeric status codes
  - Any of the Rails provided symbolic names for status codes
  - General status code categories
a007986
@cupakromer cupakromer Create `have_http_status` matcher.
The matchers passes if the provided actual `response`, or Capybara
`page`, has a matching HTTP status code. The following symbolic status
codes are allowed:

  - `Rack::Utils::SYMBOL_TO_STATUS_CODE`
  - One of the defined `ActionDispatch::TestResponse` aliases:
    - `:error`
    - `:missing`
    - `:redirect`
    - `:success`

The inspiration for this matcher comes directly from Rails' `assert_response`:

  https://github.com/rails/rails/blob/ca200378/actionpack/lib/action_dispatch/testing/assertions/response.rb#L22-L38

Thank you to all the Rails devs who did the heavy lifting on
`assert_response`!
255e7e0
@cupakromer cupakromer Add changelog note. 016f438
@cupakromer cupakromer Note `have_http_status` matcher in README. 1f405b3
@cupakromer cupakromer Add missing Changelog entries.
Note the helpful contributions made by Rodrigo Rosenfeld Rosas and
Giovanni Cappellotto.

The removal of the `ActiveModel` dependency was added to the `Breaking
Changes` section as there is a possibility (though it should be very
small) that this could break projects. Projects which implicitly depend
on `ActiveModel` to be loaded due to rspec-rails's dependency have
incorrectly setup their Gemfile.
52de86d
Commits on May 03, 2014
@JonRowe JonRowe Merge pull request #994 from tiwatson/routing-specs-nested-query
Routing specs: Switched Rack::Utils::parse_query to Rack::Utils::parse_nested_query
c501397
@JonRowe JonRowe changelog for #994 63d1422
Commits on May 05, 2014
@cupakromer cupakromer Spec out the different supported response types.
:frowning: per https://github.com/rspec/rspec-rails/blob/52de86da8d99c4749a143e18423f956f9c57d424/features/support/capybara.rb#L2-L5

> We are caught in a weird situation here. rspec-rails supports 1.8.7
> and above, but capybara beyond a certain version only supports 1.9.3
> and above.  On 1.8.7 and 1.9.2, we run most of the rspec-rails test
> suite but leave out parts that require capybara.

Digging into this it seems that after Capybara 2.0.3 [support for Ruby
1.9.2 was dropped](jnicklas/capybara#1049).
Thus, the feature spec covering this never ran.

From what I understand, rspec-rails 2.12+ moved to Capybara 2.0 for
feature specs; and no longer uses is for request specs.

This means for 1.8.7, this will only apply to the case where request
specs are using Capybara < 2.0. This version still defines the same
public API, so I guess we still need to support this edge condition.
f12f73e
Commits on May 09, 2014
@johnvoloski johnvoloski remove additional whitespace 5724921
@myronmarston myronmarston Merge pull request #1019 from johnvoloski/master
Fix unnecessary whitespace
9e09d50
Commits on May 12, 2014
@cupakromer cupakromer Matchers should return true / false from matches?
To properly implement the matcher protocol, only `true` and `false`
should be valid values to return from `matches?`.
30100eb
@cupakromer cupakromer Use a helpful failure message on bad response type 7ebec0d
@cupakromer cupakromer Use api private tag. 98f8369
@cupakromer cupakromer Shadow variable intent in the name. f29e552
@cupakromer cupakromer Add custom matcher descriptions. 38df370
@cupakromer cupakromer Memoize intermediate computations. 902cb39
@cupakromer cupakromer Switch to pessimistic operator for Rails versions. a9360d2
@cupakromer cupakromer Handle matrix configs which don't have Capybara. 27de58f
@cupakromer cupakromer Update feature to be valid Ruby. fa347de
@cupakromer cupakromer Print the rails version before running suite. ed47ac9
Commits on May 13, 2014
@cupakromer cupakromer Merge pull request #1020 from rspec/generalize-travis
Switch to pessimistic operator for Rails versions.
154d17a
@cupakromer cupakromer Merge pull request #987 from rspec/response-status-matcher
Add response status matcher
b72a5a6
@cupakromer cupakromer Explicitly set type code in spec generators. e30e083
@cupakromer cupakromer Use pessimistic matcher for default rails versions
Prevent needing to update the default rails versions for each minor
release.
c75377d
@cupakromer cupakromer Only run `test:prepare` task if available. a50c388
@cupakromer cupakromer Add note to Changelog. 2b7bc13
@cupakromer cupakromer Merge pull request #1021 from rspec/default-type-metadata
Update generator template to add `:type` metadata by default
1b8fc89
@cupakromer cupakromer Merge pull request #1022 from rspec/check-test-prepare-task
Only run `test:prepare` task if available.
cf45af0
Commits on May 16, 2014
@cupakromer cupakromer Update cuke feature with style changes.
- Capitalize scenarios
- Use backtick code blocks inline, even in scenario descriptions, and in
  feature details
- Wrap whitespace to 80 columns
- Use `RSpec.` top level
9311099
@cupakromer cupakromer Cuke scenario describing failing behavior.
The namespace does not appear to be preserved when using an anonymous
controller.
d827f3e
@cupakromer cupakromer Fix anonymous controllers namespaced routes.
- Using `resources` directly does not support `namespace`. The
  equivalent behavior can still be derived by manually adding in all of
  the options: `:as`, `:module`, `:path`.

  - http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Resources.html#method-i-resources
  - http://guides.rubyonrails.org/routing.html#prefixing-the-named-route-helpers

  > The `namespace` scope will automatically add `:as` as well as
  > `:module` and `:path` prefixes.

- Named routes are prefixed with an additional 'anonymous_' to prevent
  the rare edge cases where someone has manually defined a conflicting
  named route with the base namespace controller.

- Setup new spec context to test this state case
8dd3a33
@cupakromer cupakromer Update Changelog entries. 30298ea
@cupakromer cupakromer Merge pull request #1024 from rspec/fix-namespaced-anonymous-controll…
…er-routes

Fix namespaced anonymous controller routes
ab71447
Commits on May 18, 2014
@myronmarston myronmarston Forwardport release notes from 2.99.0.rc1 [ci skip] 69d1776
@myronmarston myronmarston Prep changelog for 3.0.0.rc1 [ci skip] d276154
@myronmarston myronmarston Release 3.0.0.rc1 4d31bdd
Commits on May 19, 2014
@JonRowe JonRowe move conditional inside module definition to make including a no-op w…
…hen theres no active_record
4396fbf
Commits on May 20, 2014
@JonRowe JonRowe Merge pull request #1028 from rspec/fix_1027
Fix issue when ActiveRecord isn't present.
70e9849
@JonRowe JonRowe changelog entry for #1028
[skip ci]
8853ac9
Commits on May 24, 2014
@cupakromer cupakromer Fix formatting for feature description.
RelishApp and Cucumber are very picky about syntax. **ANY** line which
starts with an octothorpe is treated as a comment. This makes the lexer
very unhappy.

In order to trick it I had to add a unicode space (specifically the zero
width space <200b>). This alone didn't fix things. For some reason,
using a semi-colon fixed things. I tried several additional variations,
all of which worked; but they each still required the semi-colon:

- `controller { ; }`
- `controller do; end`

I settled on this various as I felt it read a bit better with the
comment being in the `controller` definition.
c0d72d7
Commits on May 25, 2014
@myronmarston myronmarston Merge pull request #1040 from rspec/controller-doc-fixes
Fix formatting for feature description.
8e6554c
@cupakromer cupakromer Include RSpec 3 changes for inferred metadata.
- Explain the move away from inferred metadata types
- State that default configurations will add the new setting to include
  inferred metadata by default due to all of the online tutorials
- List common Rails metadata `:type` values
- Add tip about mirroring `app/` and `lib/` filesystem structure in
  `spec/`
fcacdf9
@xaviershay xaviershay Doc coverage.
* Many things are private.
* Added docs tend to be terrible, I don't have enough context to flesh
  them out.
* Still some warnings in here I don't know what to do about.
* What do we do about CI? Can rspec-dev add it for us?
ceb7232
@xaviershay xaviershay Documentation for configuration. fbd8019
@xaviershay xaviershay Unbreak MailerExampleGroup loading. f85be56
@xaviershay xaviershay Better documentation for #with a980d81
@xaviershay xaviershay Backticks e4caea1
@xaviershay xaviershay Documentation for routes=
@cupakromer not really sure if this is what you were asking for in
#1034 (comment)
5b0355a
@xaviershay xaviershay Better wording for RSpec::Rails::ViewAssigns. 627a14c
@xaviershay xaviershay Check doc coverage in travis build.
This is similar but different (see the --exclude) to the function
provided in rspec-dev, so not providing a way to sync them. It's a
simple enough function anyways.
0867209
@JonRowe JonRowe Merge pull request #1041 from rspec/fix-directory-structure-doc
Include RSpec 3 changes for inferred metadata.
6b2a6a1
Commits on May 26, 2014
@xaviershay xaviershay Need to include documentation in travis bundle for YARD checks. 4cd5139
@xaviershay xaviershay Fix broken .yardopts file 73a5529
Commits on May 27, 2014
@xaviershay xaviershay Merge pull request #1034 from rspec/doc-coverage
Doc coverage
25426da
@xaviershay xaviershay Replace mocking in generated controller specs with integration tests.
This was a terrible example and should never have been here. This
replacement isn't great, but at least is not obviously bad.

Unfortunately we cannot provide default implementations of these because
we don't have sufficient information about the data model. Specs that
require this are marked pending.

I gave up on the default approach: it doesn't work at all for models
with no attributes, and is a crapshoot if they do.
98a2a70
Commits on May 28, 2014
@xaviershay xaviershay Merge pull request #1046 from rspec/issue-1008
Replace mocking in generated controller specs with integration tests.
6ca759a
Commits on May 29, 2014
@universal universal Update README.md
Set the correct name and link for have_http_status matcher, it was still referencing the "old" name have_status.
8b8ee3d
@cupakromer cupakromer Merge pull request #1047 from universal/patch-1
Update README.md
9ff97a6
Commits on May 30, 2014
@cupakromer cupakromer Move spec_helper to rails_helper.
The first step to providing the ability to only include the necessary
parts of Rails to keep specs happy. By separating general RSpec
configuration from the Rails specific configuration, any specs which
don't need rails, can load a standard helper.

- Update Rails generators to reference the new helper file
- Fix specs for the generators
- Let cukes know about `rails_helper`
d3065c0
Commits on May 31, 2014
@inglesp inglesp Update controller_example_group.rb
fix typo in comment
57dfd6e
@cupakromer cupakromer Merge pull request #1050 from inglesp/patch-1
Fix typo in controller_example_group.rb
7cb31e1
@cupakromer cupakromer Incorporate rspec-core's project initialization.
The Rails centric helper is now `rails_helper`. Leverage the standard
RSpec configuration for creating basic configurations for `.rspec` and
`spec_helper`. This also keeps us in-sync with any future changes.

- Fix #1029
49138fb
@cupakromer cupakromer Remove duplicate settings between the helpers.
The `rails_helper` only needs to be concerned with rspec-rails specific
configurations. Any general configuration is handled by `spec_helper`.
b0df5fc
@cupakromer cupakromer Note change of `spec_helper` and `rails_helper`. b820aea
Commits on Jun 01, 2014
@cupakromer cupakromer Merge pull request #1049 from rspec/rails-helper
Separate RSpec and Rails specific configurations
5674da7
@cupakromer cupakromer Use non-monkey patch describe in generators.
In a concerted effort to keep monkey patching to a minimum. The default
Rails spec generators should not use the monkey patched version of
`describe`.

Always using only the non-monkey patched `RSpec.describe`, instead of
inspecting the configuration, has the benefits of:

- not requiring RSpec to be loaded when the generators are run by Rails
- not introducing extra logic and state to handle the different states
- Resolve #1048
ca0d249
@cupakromer cupakromer Prefer _exec over _eval alternatives.
Eval'ing Ruby code is in general a risky practice. Starting in Ruby
1.8.7+, an alternative form of these methods has been provided which
only accepts a Ruby block. These tend to be safer as they do not
directly allow string interpolation as the `_eval` equivalents do.
7c905be
@cupakromer cupakromer Remove unused steps. ea745e2
@cupakromer cupakromer Merge pull request #1052 from rspec/no-monkey-patch-generators
Use non-monkey patch describe in generators.
f41788f
@cupakromer cupakromer Replace superfluous `eval` with simple method.
The only purpose the `eval` served was to "undo" the previous `inspect`
of the value. This is a technique which is listed here:

    https://www.ruby-forum.com/topic/103775

Separate generating the raw value for an attribute and it's display
value. Keep the original `value_for` name for the display message.
217c4de
@myronmarston myronmarston Merge pull request #1051 from rspec/prefer-exec-over-eval
Prefer _exec over _eval alternatives.
55c2bbd
@myronmarston myronmarston Forwardport 2.99.0 release notes. [ci skip] 77d651c
Commits on Jun 02, 2014
@myronmarston myronmarston Update changelog for v3.0.0. [ci skip] f21e39a
@myronmarston myronmarston Release 3.0.0 8482811
@samphippen samphippen Make README.md instruct users to install 3.0.0 dbca454
@JonRowe JonRowe Merge pull request #1056 from rspec/30-readme
Make README.md instruct users to install 3.0.0
0a57752
@samphippen samphippen Add necessary requires to run the project initializer ec18105
@myronmarston myronmarston Merge pull request #1058 from rspec/fix-rails-for-3.0.0
Add necessary requires to run the project initializer
0269ccd
@myronmarston myronmarston Release 3.0.1. 2fd0780
@cupakromer cupakromer Properly reference `rails_helper` in README.
Include upgrade notes.
bc9398a
@cupakromer cupakromer Update relish upgrade guide. 1ff006e
@cupakromer cupakromer Merge pull request #1060 from rspec/fix-readme-for-rails-helper
Properly reference `rails_helper` in README.
2347e7c
Commits on Jun 04, 2014
@JonRowe JonRowe Remove Inch badge
[skip ci]
d7df534
Commits on Jun 06, 2014
@opsidao opsidao Remove duplicated word in rails_helper's comment b432e21
@cupakromer cupakromer Merge pull request #1069 from opsidao/patch-1
Remove duplicated word in rails_helper's comment
fadf48e
Commits on Jun 09, 2014
@myronmarston myronmarston Add maintenance-branch for 3.0. b84ed7c
Commits on Jun 10, 2014
@myronmarston myronmarston Merge pull request #1074 from rspec/add-maintenance-branch-3-0
Add maintenance-branch for 3.0.
30f4718
Commits on Jun 13, 2014
@JonRowe JonRowe Merge pull request #1085 from indirect/patch-1
fix 'uninitialized instance variable' warning
7b45954
@JonRowe JonRowe Update changelog for #1085 8ee31f3
@JonRowe JonRowe Merge pull request #1082 from rspec/update_readme
Add note about `infer_spec_type_from_file_location!`
5c36f3c
Commits on Jun 15, 2014
@plentz plentz updating feature docs to reflect 3.0 final release
(cherry picked from commit 7c48b71)

Merge pull request #1092 from plentz/patch-2
6385491
@cupakromer cupakromer Fix remaining Ruby warnings.
- spec/rspec/rails/minitest_lifecycle_adapter_spec.rb:
  > warning: assigned but unused variable - example

- spec/support/shared_examples.rb
  > warning: assigned but unused variable - spec_file

Ruby 1.9.3 seems to erroneously report the following warning:

- lib/rspec/rails/matchers/have_http_status.rb:
  > warning: assigned but unused variable - _ignored

This is logged on ruby-trunk: https://bugs.ruby-lang.org/issues/9943
59cef74
@cupakromer cupakromer Update Capybara to remove matcher deprecations. 4df9883
@cupakromer cupakromer Upgrade Aruba gem dependency.
The new version requires an additional, optional, `timeout` argument.
Include this argument in the world shim.
c7f3e52
@cupakromer cupakromer Fix Ruby 1.8.7 warning about regex syntax.
Noticed this when running against Ruby 1.8.7, there were two repeated
warnings based on improper escaped brackets:

- spec/rspec/rails/matchers/route_to_spec.rb:114:
  > warning: regexp has invalid interval

- spec/rspec/rails/matchers/route_to_spec.rb:114:
  > warning: regexp has `}' without escape
8e05413
@cupakromer cupakromer Backport pull request #1089 from rspec/fix-ruby-warnings
Fix warnings and deprecations notices
9341640
Commits on Jun 21, 2014
@soulcutter soulcutter Backport pull request #1102 from rspec/upgrade-documentation-tweak
'git move' should be 'git mv'
bd5da8e
@cupakromer cupakromer Document Rails 4.x improvements to schema changes. 0f7cd83
@cupakromer cupakromer Move upgrade details into feature docs.
Duplicating the documentation in two places was causing some information
to be dropped. Additionally, the README.md file was starting to be
consumed by the upgrade notes.

- Use the feature documentation as the primary location for the upgrade
  docs.
- List the important topics users need to be aware of in the README and
  link them to the section of the upgrade guide
ed6d8bd
@cupakromer cupakromer Move upgrade docs into a directory structure.
Extract out the upgrade notes from 1.x to 2.x so they are still easy to
find. Make the primary upgrade docs the main page.
92650e4
@cupakromer cupakromer Order the changes by importance.
Put the more important changes at the top of the page so that they are
read first. Placing the helper file changes first as the other changes
reference `rails_helper`. The next most important change is the
disabling of inferred metadata; as it has been a common source of
upgrade questions.
f0a396e
@cupakromer cupakromer Backport pull request #1093 from rspec/rails-4-schema-changes-docs
A few more grammar changes based on feedback.

- Remove the reference to "magical" to clear up it's meaning
- Make statements more declarative by removing personal "you"
9d55ab4
Andre Arko & Doc Ritezel Allow RSpec::Rails to load without rubygems 36f7c6e
@cupakromer cupakromer Backport pull request #1099 from rspec/wanelo-pair:without-ruby-gems
Update Changelog per #1099.
5ac0a7d
@cupakromer cupakromer Merge pull request #1105 from rspec/backports
Backport doc updates and remove RubyGem dependency
ff71085
Commits on Jul 06, 2014
@cupakromer cupakromer Move common rspec dependencies into custom Gemfile
When the example app is created for running cukes we need to setup a
Gemfile. It needs to share the same dependencies as this repo. To
facilitate this, move the common dependencies into a custom Gemfile.

Switch to using the proper bundler `eval_gemfile`, which properly
handles path location differences, instead of reading a file then using
raw `eval`.
005b4ea
@cupakromer cupakromer Use custom Gemfile with example app.
Without using a custom Gemfile, the main `rspec-rails` repo bundle is
used. Due to how various Rails autoload issues work with bundler, this
caused `RSpec::Support` to be automatically loaded by the rails
generator. The root cause of this is because `rspec-support` and
`rspec-core` are explicitly included in the Gemfile.

This differs in behavior from when a normal Rail's app only specifies
`rspec-rails` in the Gemfile. Setup an explicit Gemfile to resolve the
load difference issues.
c2536ef
@cupakromer cupakromer Include Gemfile sanity check.
Part of the reason for this not being caught earlier is due to the
gemfile being setup to not require the supporting gems by default. This
creates a few specs to help manage that.
6e3bb7c
@cupakromer cupakromer Ensure that we actually create a spec_helper file. 9f783b7
@cupakromer cupakromer Share the bundler install path. 011f510
@cupakromer cupakromer Extract rails gem loading into shared Gemfile.
When the example app is generated it puts a Rails version that is
defined by currently installed version. This works great in most
situtations, except `master` or other edge branches. The version listed
is the current version of Rails, so they diverge.

Move how we load rails into a custom Gemfile, which we eval ourselves.
We then remove the rails version put into the gemfile and share our
custom version. Due to when `rake` and other shell processes fork, the
RAILS_VERSION environment variable is properly passed through.
8e42398
@cupakromer cupakromer Merge pull request #1116 from rspec/backport-smoke-test
Backport smoke task from pull request #1087
30ae78c
@cupakromer cupakromer Fix binstub typo to generate rails command. a263e62
@cupakromer cupakromer Update travis builds now that issues are fixed. c612702
Commits on Jul 08, 2014
@cupakromer cupakromer Add reminder that _spec files are run by default.
Closes #1115
f3e7545
@cupakromer cupakromer Remove app upgrade notes in favor of linked docs.
The feature notes have all of the details of how to properly upgrade.
These are hosted online and were already linked in the above section.
Remove the duplication as it detracts from the remainder of the README.
405d8fe
@cupakromer cupakromer Use top-level namespace for `describe`.
Add consistent whitespace between `require` and the first
`RSpec.describe`.
c66356f
@cupakromer cupakromer State spec type metadata and default directories.
The directories where specs reside now essentially defaults with RSpec
3. Update make this clear and state what equivalent metadata is required
to mirror the functionality in other specs.
761c13d
@cupakromer cupakromer Use the new `have_http_status` matcher. 32cb669
@cupakromer cupakromer Remove explicit anchor tags.
Github READMEs now automatically add anchor links to the headers.
f239267
@cupakromer cupakromer Various formatting updates.
- Be consistent on how lists are defined by using a dash
- Add missing backticks around code words
- Update some descriptions with clearer information
- Add some missing hyper links
87b6c25
@cupakromer cupakromer Fix header nesting to resided under the project. 5a174be
@cupakromer cupakromer Whitespace only update. 8f64fb9
@cupakromer cupakromer Note extract of `stub_model` and `mock_model`. 3c80719
@cupakromer cupakromer Merge pull request #1119 from rspec/backport-pull-request-1117
Backport pull request #1117
6517897
Commits on Jul 21, 2014
Thomas Kriechbaumer Standardize controller spec templates.
Make single `controller_spec` template conform with scaffolded
`controller_spec`.
b65080c
@cupakromer cupakromer Update Changelog per pull request #1122. 9c5385f
@cupakromer cupakromer Backport pull request #1122 from Kriechi/adapt_template
Standardize controller spec templates.
d777359
@cupakromer cupakromer Release 3.0.2. 1700a8b
Commits on Jul 22, 2014
@JonRowe JonRowe Merge pull request #1118 from rspec/add-rubocop
Use Rubocop
17d518e
Commits on Jul 23, 2014
@JonRowe JonRowe Merge pull request #1128 from rspec/cherry-pick-rubocop-to-3-0-mainte…
…nance

Cherry pick rubocop to 3-0-maintenance
7331839
Commits on Aug 02, 2014
@cupakromer cupakromer Update note that this is exclusion is for bundler.
Close #1133
1758082
Commits on Aug 03, 2014
@cupakromer cupakromer Use RSpec module to hook into the DSL.
Recent changes to rspec-core have added `disable_monkey_patching!` to
the default `spec/spec_helper.rb` file. This caused the cukes to fail
which were not updated yet to use the non-patching method of using the
DSL.
97582d7
@cupakromer cupakromer Indent cuke ruby file definitions consistently.
Standardize on indenting the Ruby code file definitions to one level
inside the `Given` block.
8c999b5
@cupakromer cupakromer Backport pull request #1135 from rspec/no-monkey-patch-cukes
Use RSpec module to hook into the DSL
f5cdc5a
Commits on Aug 04, 2014
@cupakromer cupakromer Satisfy Rubocop's guard clause expectations.
Big thanks (づ。◕‿‿◕。)づ to @mikegee for the suggestion in
f6c277f#commitcomment-7167216.
That provided the vast majority of the refactor.

At the end of the day, this changes makes a lot more sense, separating
concerns in a more logical location.
0301ef1
@cupakromer cupakromer Note where to add requires so Rails is loaded.
There are no clear directions where additional library requires should
be included. This let's users know where to add the requires so that
Rails is loaded and availble for them.
2333518
@cupakromer cupakromer Backport pull request #1136 and #1139 into 3-0-maintenance a41cd0c
Commits on Aug 21, 2014
@joker1007 joker1007 Fix controller route lookup for Rails 4.2
Rails-4.2 splits named_routes.helpers to path_helpers and url_helpers.
And add route_defined? method to NamedRouteCollection.
49323a4
@cupakromer cupakromer Backport pull request #1142 from joker1007/adapt_named_route_helpers_…
…split

Fix controller spec fails on edge Rails
c65e157
Commits on Aug 25, 2014
@JonRowe JonRowe Merge pull request #1158 from seuros/patch-1
Update feature_generator_spec.rb
e31e037
Commits on Aug 29, 2014
@cupakromer cupakromer Backport pull request #1145 from joshk/patch-1
This branch does not use the updated build scripts.
06a81f6
@cupakromer cupakromer Drop support for Rails `master`.
Current Rails `master` branch is targeting Rails 4.2+. There are several
changes necessary for supporting Rails 4.2. These will not be included
with rspec-rails 3.0.x.
fcd79ac
Commits on Oct 14, 2014
@JonRowe JonRowe update gemspec limiting 4.2 on rspec 3.0 ec7af6b
Commits on Oct 17, 2014
@JonRowe JonRowe Merge pull request #1192 from rspec/limit_rails_versions
Update gemspec preventing 4.2 on rspec 3.0
4fc01b4