mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-23 23:58:31 -05:00
Remove dependency on Webrick for QUnit tests
This commit is contained in:
parent
8b9b87f42e
commit
d5643551cc
3 changed files with 0 additions and 5 deletions
1
Gemfile
1
Gemfile
|
@ -118,7 +118,6 @@ group :test, :development do
|
||||||
gem 'rspec-given'
|
gem 'rspec-given'
|
||||||
gem 'pry-rails'
|
gem 'pry-rails'
|
||||||
gem 'pry-nav'
|
gem 'pry-nav'
|
||||||
gem 'webrick'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
|
|
|
@ -472,7 +472,6 @@ GEM
|
||||||
uglifier (2.0.1)
|
uglifier (2.0.1)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.0, >= 1.0.2)
|
multi_json (~> 1.0, >= 1.0.2)
|
||||||
webrick (1.3.1)
|
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
@ -573,4 +572,3 @@ DEPENDENCIES
|
||||||
turbo-sprockets-rails3
|
turbo-sprockets-rails3
|
||||||
uglifier
|
uglifier
|
||||||
vestal_versions!
|
vestal_versions!
|
||||||
webrick
|
|
||||||
|
|
|
@ -3,7 +3,6 @@ desc "Runs the qunit test suite"
|
||||||
task "qunit:test" => :environment do
|
task "qunit:test" => :environment do
|
||||||
|
|
||||||
require "rack"
|
require "rack"
|
||||||
require "webrick"
|
|
||||||
|
|
||||||
unless %x{which phantomjs > /dev/null 2>&1}
|
unless %x{which phantomjs > /dev/null 2>&1}
|
||||||
abort "PhantomJS is not installed. Download from http://phantomjs.org"
|
abort "PhantomJS is not installed. Download from http://phantomjs.org"
|
||||||
|
@ -12,7 +11,6 @@ task "qunit:test" => :environment do
|
||||||
port = ENV['TEST_SERVER_PORT'] || 60099
|
port = ENV['TEST_SERVER_PORT'] || 60099
|
||||||
server = Thread.new do
|
server = Thread.new do
|
||||||
Rack::Server.start(:config => "config.ru",
|
Rack::Server.start(:config => "config.ru",
|
||||||
:Logger => WEBrick::Log.new("/dev/null"),
|
|
||||||
:AccessLog => [],
|
:AccessLog => [],
|
||||||
:Port => port)
|
:Port => port)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue