From 7c44b25b86909b679949ad1d48c994cfea243feb Mon Sep 17 00:00:00 2001 From: Antonio C Nalesso Moreira Date: Wed, 10 Jul 2013 02:36:10 +0100 Subject: [PATCH] removed require capybara/spec --- test_app/Gemfile | 1 + test_app/spec/spec_helper.rb | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/test_app/Gemfile b/test_app/Gemfile index 48a2b28..19de4ca 100644 --- a/test_app/Gemfile +++ b/test_app/Gemfile @@ -13,6 +13,7 @@ end platforms :ruby, :mswin, :mingw do gem 'pg' gem 'sqlite3' + gem 'mysql2' end gem 'json' diff --git a/test_app/spec/spec_helper.rb b/test_app/spec/spec_helper.rb index a01e29b..3659572 100644 --- a/test_app/spec/spec_helper.rb +++ b/test_app/spec/spec_helper.rb @@ -1,33 +1,26 @@ ENV["RAILS_ENV"] ||= 'test' + unless ENV['CI'] require 'simplecov' SimpleCov.start 'rails' end -require File.expand_path("../../config/environment", __FILE__) + +require File. +expand_path("../../config/environment", __FILE__) + require 'rspec/rails' require 'capybara/rails' -require 'capybara/rspec' -# Requires supporting ruby files with custom matchers and macros, etc, -# in spec/support/ and its subdirectories. -Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f} +# Custom matchers and macros, etc... +Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| + require f +} 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 - # Remove this line if you're not using ActiveRecord or ActiveRecord 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 # make the rails logger usable in the tests as logger.xxx "..."