removed require capybara/spec
This commit is contained in:
parent
0cdf1c750c
commit
7c44b25b86
|
@ -13,6 +13,7 @@ end
|
||||||
platforms :ruby, :mswin, :mingw do
|
platforms :ruby, :mswin, :mingw do
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
|
gem 'mysql2'
|
||||||
end
|
end
|
||||||
|
|
||||||
gem 'json'
|
gem 'json'
|
||||||
|
|
|
@ -1,33 +1,26 @@
|
||||||
ENV["RAILS_ENV"] ||= 'test'
|
ENV["RAILS_ENV"] ||= 'test'
|
||||||
|
|
||||||
unless ENV['CI']
|
unless ENV['CI']
|
||||||
require 'simplecov'
|
require 'simplecov'
|
||||||
SimpleCov.start 'rails'
|
SimpleCov.start 'rails'
|
||||||
end
|
end
|
||||||
require File.expand_path("../../config/environment", __FILE__)
|
|
||||||
|
require File.
|
||||||
|
expand_path("../../config/environment", __FILE__)
|
||||||
|
|
||||||
require 'rspec/rails'
|
require 'rspec/rails'
|
||||||
require 'capybara/rails'
|
require 'capybara/rails'
|
||||||
require 'capybara/rspec'
|
|
||||||
|
|
||||||
# Requires supporting ruby files with custom matchers and macros, etc,
|
# Custom matchers and macros, etc...
|
||||||
# in spec/support/ and its subdirectories.
|
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f|
|
||||||
Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
|
require f
|
||||||
|
}
|
||||||
|
|
||||||
RSpec.configure do |config|
|
RSpec.configure do |config|
|
||||||
# == Mock Framework
|
|
||||||
#
|
|
||||||
# If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
|
|
||||||
#
|
|
||||||
# config.mock_with :mocha
|
|
||||||
# config.mock_with :flexmock
|
|
||||||
# config.mock_with :rr
|
|
||||||
config.mock_with :rspec
|
config.mock_with :rspec
|
||||||
|
|
||||||
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
|
|
||||||
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
||||||
|
|
||||||
# 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
|
|
||||||
# instead of true.
|
|
||||||
config.use_transactional_fixtures = true
|
config.use_transactional_fixtures = true
|
||||||
|
|
||||||
# make the rails logger usable in the tests as logger.xxx "..."
|
# make the rails logger usable in the tests as logger.xxx "..."
|
||||||
|
|
Loading…
Reference in New Issue