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
This commit is contained in:
parent
852b9c28dd
commit
fba174e9bc
14 changed files with 59 additions and 93 deletions
|
@ -1,7 +0,0 @@
|
|||
def api_prefix
|
||||
"/api/#{Gitlab::API::VERSION}"
|
||||
end
|
||||
|
||||
def json_response
|
||||
JSON.parse(response.body)
|
||||
end
|
9
spec/support/api_helpers.rb
Normal file
9
spec/support/api_helpers.rb
Normal file
|
@ -0,0 +1,9 @@
|
|||
module ApiHelpers
|
||||
def api_prefix
|
||||
"/api/#{Gitlab::API::VERSION}"
|
||||
end
|
||||
|
||||
def json_response
|
||||
JSON.parse(response.body)
|
||||
end
|
||||
end
|
18
spec/support/db_cleaner.rb
Normal file
18
spec/support/db_cleaner.rb
Normal file
|
@ -0,0 +1,18 @@
|
|||
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
|
|
@ -1,6 +0,0 @@
|
|||
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
|
|
@ -1,30 +0,0 @@
|
|||
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"
|
||||
end
|
||||
|
||||
def login_with(user)
|
||||
visit new_user_session_path
|
||||
fill_in "user_email", with: user.email
|
||||
fill_in "user_password", with: "123456"
|
||||
click_button "Sign in"
|
||||
end
|
||||
|
||||
def logout
|
||||
click_link "Logout" rescue nil
|
||||
end
|
||||
end
|
23
spec/support/login_helpers.rb
Normal file
23
spec/support/login_helpers.rb
Normal file
|
@ -0,0 +1,23 @@
|
|||
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
|
||||
fill_in "user_password", with: "123456"
|
||||
click_button "Sign in"
|
||||
end
|
||||
|
||||
def logout
|
||||
click_link "Logout" rescue nil
|
||||
end
|
||||
end
|
51
spec/support/monkeypatch.rb
Normal file
51
spec/support/monkeypatch.rb
Normal file
|
@ -0,0 +1,51 @@
|
|||
# Stubbing Project <-> git host path
|
||||
# create project using Factory only
|
||||
class Project
|
||||
def update_repository
|
||||
true
|
||||
end
|
||||
|
||||
def destroy_repository
|
||||
true
|
||||
end
|
||||
|
||||
def path_to_repo
|
||||
File.join(Rails.root, "tmp", "tests", path)
|
||||
end
|
||||
|
||||
def satellite
|
||||
@satellite ||= FakeSatellite.new
|
||||
end
|
||||
end
|
||||
|
||||
class Key
|
||||
def update_repository
|
||||
true
|
||||
end
|
||||
|
||||
def repository_delete_key
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
class UsersProject
|
||||
def update_repository
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
class FakeSatellite
|
||||
def exists?
|
||||
true
|
||||
end
|
||||
|
||||
def create
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
class ProtectedBranch
|
||||
def update_repository
|
||||
true
|
||||
end
|
||||
end
|
|
@ -1,16 +0,0 @@
|
|||
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
|
Loading…
Add table
Add a link
Reference in a new issue