From 9ddfc6a1d5c7e7538c058ff8befe387431736d60 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
Date: Tue, 24 Apr 2012 11:42:48 -0500
Subject: [PATCH] Add more style to the integration test

---
 features/basic_integration.feature | 6 ++++--
 features/support/fakeweb.rb        | 7 +++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/features/basic_integration.feature b/features/basic_integration.feature
index ae6135262..01195aa2d 100644
--- a/features/basic_integration.feature
+++ b/features/basic_integration.feature
@@ -12,7 +12,8 @@ Feature: Rails integration
     Given I add this snippet to the User model:
       """
       attr_accessible :name, :attachment
-      has_attached_file :attachment, :url => "/system/:attachment/:style/:filename"
+      has_attached_file :attachment, :url => "/system/:attachment/:style/:filename",
+                                     :styles => { :square => "100x100#" }
       """
     And I start the rails application
     When I go to the new user page
@@ -30,7 +31,8 @@ Feature: Rails integration
       has_attached_file :attachment,
                         :storage => :s3,
                         :path => "/:attachment/:style/:filename",
-                        :s3_credentials => Rails.root.join("config/s3.yml")
+                        :s3_credentials => Rails.root.join("config/s3.yml"),
+                        :styles => { :square => "100x100#" }
       """
     And I write to "config/s3.yml" with:
       """
diff --git a/features/support/fakeweb.rb b/features/support/fakeweb.rb
index f92105b93..004551a34 100644
--- a/features/support/fakeweb.rb
+++ b/features/support/fakeweb.rb
@@ -1,3 +1,10 @@
 require 'fake_web'
 
 FakeWeb.allow_net_connect = false
+
+module FakeWeb
+  class StubSocket
+    def read_timeout=(ignored)
+    end
+  end
+end