浏览代码

Optim: move server tests scripts to test/server folder

febbweiss 10 年之前
父节点
当前提交
695fc03f67
共有 5 个文件被更改,包括 7 次插入7 次删除
  1. 2 2
      package.json
  2. 1 1
      test/server/accounts.js
  3. 1 1
      test/server/db.js
  4. 1 1
      test/server/server.js
  5. 2 2
      test/server/users.js

+ 2 - 2
package.json

@@ -25,8 +25,8 @@
     "supertest": "~1.0.1"
   },
   "scripts": {
-    "test-local": "NODE_ENV=test mocha",
-    "test": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec",
+    "test-local": "NODE_ENV=test mocha test/*",
+    "test": "NODE_ENV=test ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec test/*",
     "start": "app.js",
     "stop": "pkill -SIGINT CloudBudget"
   }

+ 1 - 1
test/accounts.js → test/server/accounts.js

@@ -1,6 +1,6 @@
 var should      = require('should'), 
     request     = require('supertest'),
-    app         = require('../server.js'),
+    app         = require('../../server.js'),
     Db          = require('./db.js'),
     globalServer, token, hacker_token, account_id;
 

+ 1 - 1
test/db.js → test/server/db.js

@@ -1,6 +1,6 @@
 var mongoose    = require('mongoose'),
     jwt         = require('jsonwebtoken'),
-    security    = require('../config/security');
+    security    = require('../../config/security');
     
 
 var USER_ID = '55c9e2e3d300cc798928cc87',

+ 1 - 1
test/server.js → test/server/server.js

@@ -1,6 +1,6 @@
 var should = require('should'), 
     request = require('supertest'),
-    app  = require('../server.js'),
+    app  = require('../../server.js'),
     globalServer;
 
 describe('Static resources', function(){

+ 2 - 2
test/users.js → test/server/users.js

@@ -1,11 +1,11 @@
 var should          = require('should'), 
     request         = require('supertest'),
-    app             = require('../server.js'),
+    app             = require('../../server.js'),
     mongoose        = require('mongoose'),
     User            = mongoose.model('User'),
     Db              = require('./db.js'),
     sinon           = require('sinon'),
-    EventEmitter    = require('../app/events/listeners'),
+    EventEmitter    = require('../../app/events/listeners'),
     globalServer, token, hacker_token, account_id, user_id;
 
 describe('API /users', function() {