Add more style to the integration test

sooding · Apr 24, 2012 · 9ddfc6a · 9ddfc6a
1 parent 8b778b3
commit 9ddfc6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -1,3 +1,10 @@
 require 'fake_web'
 
 FakeWeb.allow_net_connect = false
+
+module FakeWeb
+  class StubSocket
+    def read_timeout=(ignored)
+    end
+  end
+end