new rspec-rails version (2.6.1) + clean the cucumber env.rb file
This commit is contained in:
parent
c8f0ad0bbe
commit
b2d6a7e001
4
Gemfile
4
Gemfile
@ -44,7 +44,7 @@ gem 'SystemTimer', :platforms => :ruby_18
|
||||
group :development do
|
||||
gem 'unicorn' # Using unicorn_rails instead of webrick (default server)
|
||||
|
||||
gem 'rspec-rails', '2.3.1' # in order to have rspec tasks and generators
|
||||
gem 'rspec-rails', '2.6.1' # in order to have rspec tasks and generators
|
||||
end
|
||||
|
||||
group :test, :development do
|
||||
@ -65,7 +65,7 @@ group :test do
|
||||
gem 'autotest'
|
||||
gem 'ZenTest'
|
||||
gem 'growl-glue'
|
||||
gem 'rspec-rails', '2.3.1'
|
||||
gem 'rspec-rails', '2.6.1'
|
||||
gem 'factory_girl_rails'
|
||||
gem 'pickle'
|
||||
gem 'xpath', '~> 0.1.4'
|
||||
|
20
Gemfile.lock
20
Gemfile.lock
@ -212,19 +212,19 @@ GEM
|
||||
rest-client (1.6.3)
|
||||
mime-types (>= 1.16)
|
||||
rmagick (2.12.2)
|
||||
rspec (2.3.0)
|
||||
rspec-core (~> 2.3.0)
|
||||
rspec-expectations (~> 2.3.0)
|
||||
rspec-mocks (~> 2.3.0)
|
||||
rspec-core (2.3.1)
|
||||
rspec-expectations (2.3.0)
|
||||
rspec (2.6.0)
|
||||
rspec-core (~> 2.6.0)
|
||||
rspec-expectations (~> 2.6.0)
|
||||
rspec-mocks (~> 2.6.0)
|
||||
rspec-core (2.6.4)
|
||||
rspec-expectations (2.6.0)
|
||||
diff-lcs (~> 1.1.2)
|
||||
rspec-mocks (2.3.0)
|
||||
rspec-rails (2.3.1)
|
||||
rspec-mocks (2.6.0)
|
||||
rspec-rails (2.6.1)
|
||||
actionpack (~> 3.0)
|
||||
activesupport (~> 3.0)
|
||||
railties (~> 3.0)
|
||||
rspec (~> 2.3.0)
|
||||
rspec (~> 2.6.0)
|
||||
ruby-debug (0.10.4)
|
||||
columnize (>= 0.1)
|
||||
ruby-debug-base (~> 0.10.4.0)
|
||||
@ -311,7 +311,7 @@ DEPENDENCIES
|
||||
rails (= 3.0.9)
|
||||
rake (= 0.9.2)
|
||||
rmagick (= 2.12.2)
|
||||
rspec-rails (= 2.3.1)
|
||||
rspec-rails (= 2.6.1)
|
||||
ruby-debug
|
||||
ruby-debug19
|
||||
rubyzip
|
||||
|
@ -4,48 +4,21 @@
|
||||
# instead of editing this one. Cucumber will automatically load all features/**/*.rb
|
||||
# files.
|
||||
|
||||
# ENV['RAILS_ENV'] ||= 'test'
|
||||
#
|
||||
# require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
|
||||
#
|
||||
# require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
|
||||
# require 'cucumber/rails'
|
||||
# require 'cucumber/rails/rspec'
|
||||
# require 'cucumber/rails/world'
|
||||
# require 'cucumber/web/tableish'
|
||||
#
|
||||
# require 'capybara/rails'
|
||||
# require 'capybara/cucumber'
|
||||
# require 'capybara/session'
|
||||
#
|
||||
# # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
|
||||
# # order to ease the transition to Capybara we set the default here. If you'd
|
||||
# # prefer to use XPath just remove this line and adjust any selectors in your
|
||||
# # steps to use the XPath syntax.
|
||||
# Capybara.default_selector = :css
|
||||
#
|
||||
# Capybara.javascript_driver = :selenium
|
||||
#
|
||||
# Capybara.default_host = 'test.example.com'
|
||||
|
||||
ENV['RAILS_ENV'] ||= 'test'
|
||||
|
||||
require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
|
||||
|
||||
# require 'cucumber/rails'
|
||||
|
||||
require 'cucumber/rails'
|
||||
require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
|
||||
require 'cucumber/rails/rspec'
|
||||
require 'cucumber/rails/world'
|
||||
require 'cucumber/web/tableish'
|
||||
|
||||
# require 'capybara'
|
||||
require 'capybara'
|
||||
require 'capybara/rails'
|
||||
require 'capybara/cucumber'
|
||||
require 'capybara/session'
|
||||
|
||||
# Capybara.default_selector = :css
|
||||
|
||||
Capybara.configure do |config|
|
||||
config.run_server = false
|
||||
config.default_selector = :css
|
||||
@ -59,11 +32,7 @@ Capybara.javascript_driver = :rack_test # :selenium
|
||||
# ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16:
|
||||
# warning: regexp match /.../n against to UTF-8 string
|
||||
# more information here: https://github.com/jnicklas/capybara/issues/243
|
||||
# $VERBOSE = nil
|
||||
|
||||
# Capybara.default_host = 'test.example.com'
|
||||
|
||||
# Capybara.app_host = 'test.example.com'
|
||||
$VERBOSE = nil
|
||||
|
||||
# By default, any exception happening in your Rails application will bubble up
|
||||
# to Cucumber so that your scenario will fail. This is a different from how
|
||||
@ -80,83 +49,9 @@ Capybara.javascript_driver = :rack_test # :selenium
|
||||
# 2) Set the value below to true. Beware that doing this globally is not
|
||||
# recommended as it will mask a lot of errors for you!
|
||||
#
|
||||
# ActionController::Base.allow_rescue = false
|
||||
|
||||
# # Remove/comment out the lines below if your app doesn't have a database.
|
||||
# # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
|
||||
# begin
|
||||
# DatabaseCleaner.strategy = :transaction
|
||||
# rescue NameError
|
||||
# raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
|
||||
# end
|
||||
|
||||
ActionController::Base.allow_rescue = false
|
||||
|
||||
require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/carrierwave')
|
||||
require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/locomotive')
|
||||
|
||||
Locomotive.configure_for_test(true)
|
||||
|
||||
# You may also want to configure DatabaseCleaner to use different strategies for certain features and scenarios.
|
||||
# See the DatabaseCleaner documentation for details. Example:
|
||||
#
|
||||
# Before('@no-txn,@selenium,@culerity,@celerity,@javascript') do
|
||||
# DatabaseCleaner.strategy = :truncation, {:except => %w[widgets]}
|
||||
# end
|
||||
#
|
||||
# Before('~@no-txn', '~@selenium', '~@culerity', '~@celerity', '~@javascript') do
|
||||
# DatabaseCleaner.strategy = :transaction
|
||||
# end
|
||||
#
|
||||
|
||||
|
||||
# # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
|
||||
# # It is recommended to regenerate this file in the future when you upgrade to a
|
||||
# # newer version of cucumber-rails. Consider adding your own code to a new file
|
||||
# # instead of editing this one. Cucumber will automatically load all features/**/*.rb
|
||||
# # files.
|
||||
#
|
||||
# ENV["RAILS_ENV"] ||= "test"
|
||||
# require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
|
||||
#
|
||||
# # require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
|
||||
# # require 'cucumber/rails/rspec'
|
||||
# # require 'cucumber/rails/world'
|
||||
# # require 'cucumber/web/tableish'
|
||||
#
|
||||
# require 'cucumber/rails'
|
||||
#
|
||||
# require 'capybara/rails'
|
||||
# require 'capybara/cucumber'
|
||||
# require 'capybara/session'
|
||||
#
|
||||
# # require 'ruby-debug'
|
||||
#
|
||||
# # envjs doesnt work at the moment
|
||||
# # require 'capybara/envjs'
|
||||
#
|
||||
# # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
|
||||
# # order to ease the transition to Capybara we set the default here. If you'd
|
||||
# # prefer to use XPath just remove this line and adjust any selectors in your
|
||||
# # steps to use the XPath syntax.
|
||||
# Capybara.default_selector = :css
|
||||
#
|
||||
# Capybara.javascript_driver = :selenium
|
||||
#
|
||||
# # If you set this to false, any error raised from within your app will bubble
|
||||
# # up to your step definition and out to cucumber unless you catch it somewhere
|
||||
# # on the way. You can make Rails rescue errors and render error pages on a
|
||||
# # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
|
||||
# #
|
||||
# # If you set this to true, Rails will rescue all errors and render error
|
||||
# # pages, more or less in the same way your application would behave in the
|
||||
# # default production environment. It's not recommended to do this for all
|
||||
# # of your scenarios, as this makes it hard to discover errors in your application.
|
||||
# ActionController::Base.allow_rescue = false
|
||||
#
|
||||
# Capybara.default_host = 'test.example.com'
|
||||
# # Capybara.app_host = 'http://test.example.com'
|
||||
#
|
||||
# require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/carrierwave')
|
||||
# require File.expand_path(File.dirname(__FILE__) + '/../../spec/support/locomotive')
|
||||
#
|
||||
# Locomotive.configure_for_test(true)
|
||||
Locomotive.configure_for_test(true)
|
Loading…
Reference in New Issue
Block a user