mirror of
https://github.com/moparisthebest/mailcatcher
synced 2024-12-21 23:08:54 -05:00
Fix some load order issues
This commit is contained in:
parent
18797b26ee
commit
ed72712daa
@ -7,7 +7,6 @@ require "skinny"
|
||||
|
||||
require "mail_catcher/events"
|
||||
require "mail_catcher/mail"
|
||||
require "mail_catcher/web"
|
||||
|
||||
class Sinatra::Request
|
||||
include Skinny::Helpers
|
||||
|
@ -2,12 +2,10 @@ require "sprockets"
|
||||
require "sprockets-sass"
|
||||
require "compass"
|
||||
|
||||
require "mail_catcher/web/application"
|
||||
|
||||
module MailCatcher
|
||||
module Web
|
||||
Assets = Sprockets::Environment.new(Application.root).tap do |sprockets|
|
||||
Dir["#{Application.root}/{,vendor}/assets/*"].each do |path|
|
||||
Assets = Sprockets::Environment.new(File.expand_path("#{__FILE__}/../../../..")).tap do |sprockets|
|
||||
Dir["#{sprockets.root}/{,vendor}/assets/*"].each do |path|
|
||||
sprockets.append_path(path)
|
||||
end
|
||||
end
|
||||
|
@ -1,3 +1,5 @@
|
||||
ENV["MAILCATCHER_ENV"] = "test"
|
||||
|
||||
require "minitest/autorun"
|
||||
require "mail_catcher"
|
||||
require "socket"
|
||||
|
Loading…
Reference in New Issue
Block a user