diff --git a/app.coffee b/app.coffee index 068c7a9..e199769 100755 --- a/app.coffee +++ b/app.coffee @@ -56,6 +56,9 @@ do -> config = require './config' +if process.env.NODE_ENV == 'test' + config.web.listen = require('./sample/travis-ci.config').web.listen + do -> if fs.existsSync config.web.listen fs.unlinkSync config.web.listen diff --git a/core/test/router/account.test.coffee b/core/test/router/account.test.coffee new file mode 100644 index 0000000..2468cdf --- /dev/null +++ b/core/test/router/account.test.coffee @@ -0,0 +1,21 @@ +client.defaultOptions + uri_prefix: '/account/' + +describe 'router/account', -> + it 'GET register', (done) -> + client.get 'register', + response_json: false + , -> + done() + + it 'GET login', (done) -> + client.get 'login', + response_json: false + , -> + done() + + it 'GET preferences', (done) -> + client.get 'preferences', + response_json: false + , -> + done() diff --git a/sample/travis-ci.config.coffee b/sample/travis-ci.config.coffee index 4666729..59bf37f 100644 --- a/sample/travis-ci.config.coffee +++ b/sample/travis-ci.config.coffee @@ -2,7 +2,7 @@ module.exports = web: t_name: 'plugins.rpvhost.site_name' url: 'http://rp.rpvhost.net' - listen: 3000 + listen: 12558 google_analytics_id: '' account: diff --git a/test/support/client.coffee b/test/support/client.coffee index c39c0d0..bebf418 100644 --- a/test/support/client.coffee +++ b/test/support/client.coffee @@ -1,15 +1,10 @@ request = require 'request' -if fs.existsSync config.web.listen - uri_prefix = "http://unix:#{config.web.listen}:" -else - uri_prefix = "http://127.0.0.1:#{config.web.listen}" - exports.get = (url, options, callback) -> options = deepmerge module.exports.default_options, options options = deepmerge options, - uri: "#{uri_prefix}#{options.uri_prefix ? ''}#{url}" + uri: "http://127.0.0.1:#{app.config.web.listen}#{options.uri_prefix ? ''}#{url}" request options, (err, res, body) -> throw err if err diff --git a/test/support/env.coffee b/test/support/env.coffee index 1d3266b..ec63e9d 100644 --- a/test/support/env.coffee +++ b/test/support/env.coffee @@ -7,9 +7,6 @@ if process.env.COV_TEST == 'true' exclude: ['test', 'node_modules', '.git', 'sample', 'core/static'] initAll: true -global.config = require '../../config' -global.config.web.listen = 12558 - global._ = require 'underscore' global.fs = require 'fs' global.async = require 'async'