Skip to content

Commit c84f507

Browse files
committedOct 6, 2014
Add a spec for sprockets/server
1 parent 8e20d29 commit c84f507

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed
 

‎lib/opal/sprockets/server.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,18 @@ def use_gem gem_name
104104

105105
def create_app
106106
server, sprockets, prefix = self, @sprockets, self.prefix
107-
sprockets.logger.level = Logger::DEBUG
108-
apps = []
109-
apps << Rack::Builder.app do
107+
sprockets.logger.level ||= Logger::DEBUG
108+
@app = Rack::Builder.app do
110109
not_found = lambda { |env| [404, {}, []] }
111110
use Rack::Deflater
112111
use Rack::ShowExceptions
113112
use Index, server if server.use_index
113+
assets = []
114+
assets << SourceMapServer.new(sprockets, prefix) if server.source_map_enabled
115+
assets << sprockets
116+
map(prefix) { run Rack::Cascade.new(assets) }
114117
run Rack::Static.new(not_found, :root => server.public_root, :urls => server.public_urls)
115118
end
116-
apps << SourceMapServer.new(sprockets, prefix) if server.source_map_enabled
117-
apps << sprockets
118-
@app = Rack::Cascade.new(apps)
119119
end
120120

121121
def call(env)

‎opal.gemspec

+1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
3232
s.add_development_dependency 'octokit', '~> 2.4.0'
3333
s.add_development_dependency 'bundler', '~> 1.5'
3434
s.add_development_dependency 'yard', '~> 0.8.7'
35+
s.add_development_dependency 'rack-test'
3536
end

‎spec/lib/sprockets/server_spec.rb

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
require 'lib/spec_helper'
2+
require 'rack/test'
3+
4+
describe Opal::Server do
5+
include Rack::Test::Methods
6+
7+
def app
8+
described_class.new { |s|
9+
s.main = 'opal'
10+
s.debug = false
11+
s.sprockets.logger = Logger.new('/dev/null')
12+
}
13+
end
14+
15+
it 'serves assets from /assets' do
16+
get '/assets/opal.js'
17+
expect(last_response).to be_ok
18+
end
19+
20+
end

0 commit comments

Comments
 (0)
Please sign in to comment.