Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-08-23 13:19:40 +0400
committerRobert Speicher <rspeicher@gmail.com>2012-08-25 22:19:15 +0400
commitfba174e9bc4e4ef5c0c4d6a4282f37e5265b87e2 (patch)
treef53e56b4f694ffefac5d3b744f48deccceb1631e /features/support
parent852b9c28dd80af4a49336b0ff921a1a863dbc929 (diff)
Cleanup spec/support folder and spec/spec_helper
Changes: * Move spec/monkeypatch to spec/support * Remove unused support/shared_examples * Move support/api to support/api_helpers to match module name * Move support/login to support/login_helpers to match module name * Move API specs to requests/api (convention over configuration) * Remove unused support/js_patch * Simplify login_as helper * Move DatabaseCleaner stuff to its own support file * Remove unnecessary configuration and requires from spec_helper
Diffstat (limited to 'features/support')
-rw-r--r--features/support/env.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/support/env.rb b/features/support/env.rb
index b69a5fe7f07..80a465b472c 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -7,9 +7,9 @@ require 'cucumber/rails'
require 'webmock/cucumber'
WebMock.allow_net_connect!
-require Rails.root.join 'spec/monkeypatch'
require Rails.root.join 'spec/factories'
-require Rails.root.join 'spec/support/login'
+require Rails.root.join 'spec/support/monkeypatch'
+require Rails.root.join 'spec/support/login_helpers'
require Rails.root.join 'spec/support/valid_commit'
Capybara.default_selector = :css