nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove webmock from cucumber to try and fix the travis timeout errors :(

Browse source
This commit is contained in:
Maxwell Salzberg 2012-04-03 22:16:51 -07:00
parent 518d2be1e1
commit cf3776fde2
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -140,7 +140,6 @@ gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git'
group :test do group :test do
gem 'capybara', '~> 1.1.2' gem 'capybara', '~> 1.1.2'
gem 'cucumber-rails', '1.2.1', :require => false gem 'cucumber-rails', '1.2.1', :require => false
gem 'cucumber-api-steps', '0.6', :require => false
gem 'database_cleaner', '0.7.1' gem 'database_cleaner', '0.7.1'
gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git' gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'

6
Gemfile.lock
View file

@ -127,9 +127,6 @@ GEM
gherkin (~> 2.9.0) gherkin (~> 2.9.0)
json (>= 1.4.6) json (>= 1.4.6)
term-ansicolor (>= 1.0.6) term-ansicolor (>= 1.0.6)
cucumber-api-steps (0.6)
cucumber (>= 0.8.3)
jsonpath (>= 0.1.2)
cucumber-rails (1.2.1) cucumber-rails (1.2.1)
capybara (>= 1.1.2) capybara (>= 1.1.2)
cucumber (>= 1.1.3) cucumber (>= 1.1.3)
@ -238,8 +235,6 @@ GEM
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.6) json (1.6.6)
jsonpath (0.5.0)
multi_json
jwt (0.1.4) jwt (0.1.4)
json (>= 1.2.4) json (>= 1.2.4)
kgio (2.7.4) kgio (2.7.4)
@ -486,7 +481,6 @@ DEPENDENCIES
capybara (~> 1.1.2) capybara (~> 1.1.2)
carrierwave (= 0.5.8) carrierwave (= 0.5.8)
client_side_validations client_side_validations
cucumber-api-steps (= 0.6)
cucumber-rails (= 1.2.1) cucumber-rails (= 1.2.1)
database_cleaner (= 0.7.1) database_cleaner (= 0.7.1)
devise (= 1.5.3) devise (= 1.5.3)

5
features/support/env.rb
View file

@ -11,7 +11,6 @@ Spork.prefork do
require 'capybara/cucumber' require 'capybara/cucumber'
require 'capybara/session' require 'capybara/session'
#require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript #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 # Ensure we know the appservers port
Capybara.server_port = 9887 Capybara.server_port = 9887
@ -54,8 +53,8 @@ Spork.prefork do
require File.join(File.dirname(__FILE__), "..", "..", "spec", "support","user_methods") require File.join(File.dirname(__FILE__), "..", "..", "spec", "support","user_methods")
include HelperMethods include HelperMethods
require 'webmock/cucumber' # require 'webmock/cucumber'
WebMock.disable_net_connect!(:allow_localhost => true) # WebMock.disable_net_connect!(:allow_localhost => true)
silence_warnings do silence_warnings do
SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'} SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'}