From 533a987684caf53bd13b7948e7e5321fb9294136 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Wed, 8 Jan 2014 15:20:18 +1100 Subject: [PATCH] Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom --- app/views/shop/_products.html.haml | 4 ++-- spec/spec_helper.rb | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml index 034cd53ab6..3019d22967 100644 --- a/app/views/shop/_products.html.haml +++ b/app/views/shop/_products.html.haml @@ -13,8 +13,8 @@ %tbody{"ng-repeat" => "product in data.products | filter:query"} %tr.product %td - -#%img{src: "{{ product.master.images[0].small_url }}"} - -#{{product.master.images[0].alt}} + %img{"ng-src" => "{{ product.master.images[0].small_url }}"} + {{product.master.images[0].alt}} %td %h5 {{ product.name }} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 66eb4753d1..b58653c8a8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -33,9 +33,10 @@ require 'capybara/poltergeist' Capybara.javascript_driver = :poltergeist # For debugging, extend poltergeist's timeout -# Capybara.register_driver :poltergeist do |app| -# Capybara::Poltergeist::Driver.new(app, timeout: 5.minutes) -# end + Capybara.register_driver :poltergeist do |app| + #Capybara::Poltergeist::Driver.new(app, timeout: 5.minutes) + Capybara::Poltergeist::Driver.new(app, phantomjs_options: ['--load-images=no'] ) + end require "paperclip/matchers"