Permalink
Browse files

config env should be required by config.ru

  • Loading branch information...
1 parent 9c6284a commit 6f604ee065081a47d22db5b45bfd0e0dd5caf114 @josh josh committed with Dec 16, 2009
Showing with 4 additions and 2 deletions.
  1. +1 −0 config.ru
  2. +0 −2 image_server.rb
  3. +1 −0 test/test_image_variant_generator.rb
  4. +1 −0 test/test_remote_proxy.rb
  5. +1 −0 test/test_svg_generation.rb
View
@@ -4,6 +4,7 @@ require 'rubygems'
require 'rack/cache'
require 'rack/contrib'
require 'image_server'
+require 'config/env'
# Add rack sendfile extension.
# Allows us to serve cache hits directly from file system
View
@@ -10,8 +10,6 @@
require 'lib/image_variant_generator'
require 'lib/image'
-require 'config/env'
-
class ImageServer
include SendFile
@@ -6,6 +6,7 @@
require 'mocha'
require 'rack'
require File.dirname(__FILE__) + '/../image_server'
+require 'config/env'
FakeWeb.allow_net_connect = false
FakeWeb.register_uri(:get, "http://static.shopify.com/image.png", :body => File.read( File.dirname(__FILE__) + '/assets/fish.png'), :content_type => "image/png", :cache_control => 'public, max-age=0')
@@ -6,6 +6,7 @@
require 'mocha'
require File.dirname(__FILE__) + '/../image_server'
+require 'config/env'
# FakeWeb.allow_net_connect = false
# FakeWeb.register_uri(:get, "http://static.shopify.com/test.txt", :body => "Hello World!", :content_type => "text/plain", :cache_control => 'public, max-age=0')
@@ -5,6 +5,7 @@
require 'mocha'
require 'rack'
require File.dirname(__FILE__) + '/../image_server'
+require 'config/env'
class TestRemoteProxy < Test::Unit::TestCase

0 comments on commit 6f604ee

Please sign in to comment.