From fa9de09d0320bab8952c711caf4c456e461f152e Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Sun, 11 Dec 2011 00:57:36 +0900 Subject: [PATCH] from Steak to Capybara --- kaminari.gemspec | 3 +-- spec/acceptance/acceptance_helper.rb | 5 ----- spec/acceptance/support/helpers.rb | 5 ----- spec/acceptance/support/paths.rb | 9 --------- spec/acceptance/users_spec.rb | 2 +- 5 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 spec/acceptance/acceptance_helper.rb delete mode 100644 spec/acceptance/support/helpers.rb delete mode 100644 spec/acceptance/support/paths.rb diff --git a/kaminari.gemspec b/kaminari.gemspec index c81f257..35bc20d 100644 --- a/kaminari.gemspec +++ b/kaminari.gemspec @@ -38,8 +38,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rspec', ['>= 0'] s.add_development_dependency 'rspec-rails', ['>= 0'] s.add_development_dependency 'rr', ['>= 0'] - s.add_development_dependency 'steak', ['>= 0'] - s.add_development_dependency 'capybara', ['>= 0'] + s.add_development_dependency 'capybara', ['>= 1.0'] s.add_development_dependency 'database_cleaner', ['>= 0'] s.add_development_dependency 'padrino-helpers', ['~> 0.10'] s.add_development_dependency 'rack-test', ['>= 0'] diff --git a/spec/acceptance/acceptance_helper.rb b/spec/acceptance/acceptance_helper.rb deleted file mode 100644 index a59648f..0000000 --- a/spec/acceptance/acceptance_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -require File.expand_path(File.dirname(__FILE__) + "/../spec_helper") -require "steak" - -# Put your acceptance spec helpers inside /spec/acceptance/support -Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f} \ No newline at end of file diff --git a/spec/acceptance/support/helpers.rb b/spec/acceptance/support/helpers.rb deleted file mode 100644 index 5d1de53..0000000 --- a/spec/acceptance/support/helpers.rb +++ /dev/null @@ -1,5 +0,0 @@ -module HelperMethods - # Put helper methods you need to be available in all tests here. -end - -RSpec.configuration.include HelperMethods, :type => :acceptance diff --git a/spec/acceptance/support/paths.rb b/spec/acceptance/support/paths.rb deleted file mode 100644 index f623f48..0000000 --- a/spec/acceptance/support/paths.rb +++ /dev/null @@ -1,9 +0,0 @@ -module NavigationHelpers - # Put helper methods related to the paths in your application here. - - def homepage - "/" - end -end - -RSpec.configuration.include NavigationHelpers, :type => :acceptance diff --git a/spec/acceptance/users_spec.rb b/spec/acceptance/users_spec.rb index 4afd5b9..15179a9 100644 --- a/spec/acceptance/users_spec.rb +++ b/spec/acceptance/users_spec.rb @@ -1,5 +1,5 @@ # encoding: UTF-8 -require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper') +require File.expand_path('../spec_helper', File.dirname(__FILE__)) feature 'Users' do background do