diff --git a/Gemfile b/Gemfile index bbc443f0a..c4ad128c3 100644 --- a/Gemfile +++ b/Gemfile @@ -140,7 +140,6 @@ gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git' group :test do gem 'capybara', '~> 1.1.2' gem 'cucumber-rails', '1.2.1', :require => false - gem 'cucumber-api-steps', '0.6', :require => false gem 'database_cleaner', '0.7.1' gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git' diff --git a/Gemfile.lock b/Gemfile.lock index 1a5e08a01..0bf14ef50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,9 +127,6 @@ GEM gherkin (~> 2.9.0) json (>= 1.4.6) term-ansicolor (>= 1.0.6) - cucumber-api-steps (0.6) - cucumber (>= 0.8.3) - jsonpath (>= 0.1.2) cucumber-rails (1.2.1) capybara (>= 1.1.2) cucumber (>= 1.1.3) @@ -238,8 +235,6 @@ GEM railties (~> 3.0) thor (~> 0.14) json (1.6.6) - jsonpath (0.5.0) - multi_json jwt (0.1.4) json (>= 1.2.4) kgio (2.7.4) @@ -486,7 +481,6 @@ DEPENDENCIES capybara (~> 1.1.2) carrierwave (= 0.5.8) client_side_validations - cucumber-api-steps (= 0.6) cucumber-rails (= 1.2.1) database_cleaner (= 0.7.1) devise (= 1.5.3) diff --git a/features/support/env.rb b/features/support/env.rb index f833d6f7c..526c564c7 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -11,7 +11,6 @@ Spork.prefork do require 'capybara/cucumber' require 'capybara/session' #require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript - require 'cucumber/api_steps' # Ensure we know the appservers port Capybara.server_port = 9887 @@ -54,8 +53,8 @@ Spork.prefork do require File.join(File.dirname(__FILE__), "..", "..", "spec", "support","user_methods") include HelperMethods - require 'webmock/cucumber' - WebMock.disable_net_connect!(:allow_localhost => true) + # require 'webmock/cucumber' + # WebMock.disable_net_connect!(:allow_localhost => true) silence_warnings do SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'}