From a462886fe5332e66d83c1d3e5b7eb569552f66ce Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Fri, 30 Oct 2015 17:07:31 +0000 Subject: [PATCH] Screw it, rely on an image being on Cloudinary --- .env.test | 2 +- Gemfile | 1 - Gemfile.lock | 7 ------- spec/features/visitor_navigates_site_spec.rb | 4 ---- spec/spec_helper.rb | 3 --- 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.env.test b/.env.test index a4a2515..d6dcb74 100644 --- a/.env.test +++ b/.env.test @@ -1 +1 @@ -export CLOUDINARY_CLOUD_NAME=test +export CLOUDINARY_CLOUD_NAME=danbarber diff --git a/Gemfile b/Gemfile index 77ef190..185ce46 100644 --- a/Gemfile +++ b/Gemfile @@ -67,4 +67,3 @@ gem 'skylight' gem 'slugtastic' gem 'squeel' gem 'unf' -gem 'webmock' diff --git a/Gemfile.lock b/Gemfile.lock index 9d8f549..148db88 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,8 +99,6 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - crack (0.4.2) - safe_yaml (~> 1.0.0) database_cleaner (1.5.0) datetime_picker_rails (0.0.4) momentjs-rails (>= 2.8.1) @@ -282,7 +280,6 @@ GEM ruby-progressbar (1.7.5) ruby_parser (3.7.1) sexp_processor (~> 4.1) - safe_yaml (1.0.4) sass (3.4.19) sass-rails (5.0.4) railties (>= 4.0.0, < 5.0) @@ -333,9 +330,6 @@ GEM unf_ext (0.0.7.1) warden (1.2.3) rack (>= 1.0) - webmock (1.21.0) - addressable (>= 2.3.6) - crack (>= 0.3.2) websocket-driver (0.6.2) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -388,7 +382,6 @@ DEPENDENCIES squeel uglifier unf - webmock BUNDLED WITH 1.10.6 diff --git a/spec/features/visitor_navigates_site_spec.rb b/spec/features/visitor_navigates_site_spec.rb index bade776..9ef4093 100644 --- a/spec/features/visitor_navigates_site_spec.rb +++ b/spec/features/visitor_navigates_site_spec.rb @@ -10,10 +10,6 @@ feature 'visitor navigates site' do end it 'increments the view counter when an image is displayed', js: true do - image = File.read(File.join(fixture_path, 'photo.jpg')) - stub_request(:get, 'http://res.cloudinary.com/test/image/upload/photo.jpg') - .to_return(body: image, headers: { 'Content-Type' => 'image/jpeg' }) - category = create(:category) photo = create(:photo, image_cloudinary_id: 'photo', featured: true, categories: [category]) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 474f04a..7524347 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,7 +4,6 @@ require File.expand_path('../../config/environment', __FILE__) require 'rspec/rails' require 'capybara/rspec' require 'capybara/poltergeist' -require 'webmock/rspec' # For code coverage require 'simplecov' @@ -17,8 +16,6 @@ Capybara.javascript_driver = :poltergeist # in spec/support/ and its subdirectories. Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } -WebMock.disable_net_connect!(:allow_localhost => true) - RSpec.configure do |config| # ## Mock Framework #