Permalink
Browse files

Merge pull request #114 from moll/patch-1

Fix Ctrl-C on Ruby v1.8.7.
  • Loading branch information...
2 parents 91c1306 + b6681ca commit 54b37cf9a51df49a77d15640e3e0caa46a508c1d @ragaskar ragaskar committed Nov 12, 2012
Showing with 1 addition and 13 deletions.
  1. +1 −1 lib/jasmine/dependencies.rb
  2. +0 −12 spec/dependencies_spec.rb
@@ -19,7 +19,7 @@ def rails3?
end
def legacy_rack?
- !Rack.constants.include?(:Server)
+ !defined?(Rack::Server)
end
def rails_3_asset_pipeline?
View
@@ -311,17 +311,5 @@ module Rails
end
end
end
-
- describe "legacy_rack?" do
- it "should return false if Rack::Server exists" do
- Rack.stub(:constants).and_return([:Server])
- Jasmine::Dependencies.legacy_rack?.should be_false
- end
- it "should return true if Rack::Server does not exist" do
- Rack.stub(:constants).and_return([])
- Jasmine::Dependencies.legacy_rack?.should be_true
- end
- end
end
-
end

0 comments on commit 54b37cf

Please sign in to comment.