Commit fba174e9 authored by Robert Speicher's avatar Robert Speicher

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
parent 852b9c28
include LoginMacros
include LoginHelpers
Given /^I signin as a user$/ do
login_as :user
......
......@@ -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
......
......@@ -9,10 +9,8 @@ require File.expand_path("../../config/environment", __FILE__)
require 'rspec/rails'
require 'capybara/rails'
require 'capybara/rspec'
require 'capybara/dsl'
require 'webmock/rspec'
require 'factories'
require 'monkeypatch'
require 'email_spec'
require 'headless'
......@@ -23,10 +21,13 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
# Use capybara-webkit
Capybara.javascript_driver = :webkit
WebMock.disable_net_connect!(allow_localhost: true)
RSpec.configure do |config|
config.mock_with :rspec
config.include LoginMacros
config.include LoginHelpers, type: :request
config.include ApiHelpers, type: :request
# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
......@@ -38,35 +39,9 @@ RSpec.configure do |config|
headless.start
end
config.before :each, type: :integration do
DeviseSessionMock.disable
end
config.before do
if example.metadata[:js]
DatabaseCleaner.strategy = :truncation
Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
else
DatabaseCleaner.strategy = :transaction
end
DatabaseCleaner.start
WebMock.disable_net_connect!(allow_localhost: true)
# !!! Observers disabled by default in tests
#
# Use next code to enable observers
# before(:each) { ActiveRecord::Base.observers.enable(:all) }
#
ActiveRecord::Base.observers.disable :all
end
config.after do
DatabaseCleaner.clean
ActiveRecord::Base.observers.disable(:all)
# ActiveRecord::Base.observers.enable(:all)
end
config.include RSpec::Rails::RequestExampleGroup, type: :request, example_group: {
file_path: /spec\/api/
}
end
def api_prefix
"/api/#{Gitlab::API::VERSION}"
end
def json_response
JSON.parse(response.body)
end
module ApiHelpers
def api_prefix
"/api/#{Gitlab::API::VERSION}"
end
def json_response
JSON.parse(response.body)
end
end
require 'database_cleaner'
RSpec.configure do |config|
config.before do
if example.metadata[:js]
DatabaseCleaner.strategy = :truncation
Capybara::Selenium::Driver::DEFAULT_OPTIONS[:resynchronize] = true
else
DatabaseCleaner.strategy = :transaction
end
DatabaseCleaner.start
end
config.after do
DatabaseCleaner.clean
end
end
module JsPatch
def confirm_js_popup
page.evaluate_script("window.alert = function(msg) { return true; }")
page.evaluate_script("window.confirm = function(msg) { return true; }")
end
end
module LoginMacros
def login_as role
@user = User.create(email: "user#{User.count}@mail.com",
name: "John Smith",
password: "123456",
password_confirmation: "123456",
skype: 'user_skype')
if role == :admin
@user.admin = true
@user.save!
end
visit new_user_session_path
fill_in "user_email", with: @user.email
fill_in "user_password", with: "123456"
click_button "Sign in"
module LoginHelpers
# Internal: Create and log in as a user of the specified role
#
# role - User role (e.g., :admin, :user)
def login_as(role)
@user = Factory(role)
login_with(@user)
end
# Internal: Login as the specified user
#
# user - User instance to login with
def login_with(user)
visit new_user_session_path
fill_in "user_email", with: user.email
......
shared_examples_for :project_side_pane do
subject { page }
it { should have_content((@project || project).name) }
it { should have_content("Commits") }
it { should have_content("Files") }
end
shared_examples_for :tree_view do
subject { page }
it "should have Tree View of project" do
should have_content("app")
should have_content("History")
should have_content("Gemfile")
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment