From 843ae446905b54cc11a4e06e68fc2e16eff1c957 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 2 Sep 2013 16:41:16 +0000 Subject: [PATCH] * taking off local of bundle install --- Gemfile | 2 +- build | 4 ++-- spec/spec_helper.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index f38228f43..c1ca987bd 100644 --- a/Gemfile +++ b/Gemfile @@ -93,7 +93,7 @@ end gem 'rack-test' # gem 'rb-fsevent', '0.9.1', :require => false # gem 'growl', '1.0.3' - gem 'poltergeist', '1.3.0' # can't go to 1.4.0 until this is fixed https://github.com/jonleighton/poltergeist/issues/385 + gem 'poltergeist' #, '1.3.0' # can't go to 1.4.0 until this is fixed https://github.com/jonleighton/poltergeist/issues/385 end group :production do diff --git a/build b/build index d694cfd6b..beef77515 100755 --- a/build +++ b/build @@ -13,8 +13,8 @@ rm -rf vendor/bundle rm -rf tmp/capybara rm Gemfile.lock # if we don't want versions to float, pin it in the Gemfile, not count on Gemfile.lock # put all dependencies into vendor/bundle -bundle install --path vendor/bundle --local -#bundle update +bundle install --path vendor/bundle +bundle update # clean assets, because they may be lingering from last build bundle exec rake assets:clean diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index fc6bdc6df..c014c673c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -40,7 +40,7 @@ Spork.prefork do require 'capybara-screenshot/rspec' require 'capybara/poltergeist' Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, { debug: false, phantomjs_logger: File.open('log/phantomjs.out', 'w') }) + #Capybara::Poltergeist::Driver.new(app, { debug: false, phantomjs_logger: File.open('log/phantomjs.out', 'w') }) end Capybara.javascript_driver = :poltergeist