diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-06-28 20:16:10 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-06-30 17:47:53 -0400 |
| commit | 366799bbf143220fe34e53e56cac0fccf8ad4f1f (patch) | |
| tree | 35acf50bf8027916db141fd56cfa4bba14c588f1 /spec | |
| parent | a7773dd7e57158ac9006c582b999a75f09d1ec21 (diff) | |
| download | gitlab-ce-366799bbf143220fe34e53e56cac0fccf8ad4f1f.tar.gz | |
Add spec/support/factory_girl
Just for consistency with our Capybara, DatabaseCleaner, WebMock, etc.
setups.
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec_helper.rb | 7 | ||||
| -rw-r--r-- | spec/support/factory_girl.rb | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 666d56079d7..e5fafe4e53f 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -13,12 +13,11 @@ RSpec.configure do |config| config.use_instantiated_fixtures = false config.mock_with :rspec - config.include LoginHelpers, type: :feature - config.include LoginHelpers, type: :request - config.include FactoryGirl::Syntax::Methods config.include Devise::TestHelpers, type: :controller - + config.include LoginHelpers, type: :feature + config.include LoginHelpers, type: :request config.include TestEnv + config.infer_spec_type_from_file_location! config.raise_errors_for_deprecations! diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb new file mode 100644 index 00000000000..eec437fb3aa --- /dev/null +++ b/spec/support/factory_girl.rb @@ -0,0 +1,3 @@ +RSpec.configure do |config| + config.include FactoryGirl::Syntax::Methods +end |