Procházet zdrojové kódy

Update tests to be less weird and report more accurate coverage

Matt Coles před 9 roky
rodič
revize
ff1565e1df
5 změnil soubory, kde provedl 28 přidání a 20 odebrání
  1. 23 14
      index.js
  2. 1 3
      package.json
  3. 2 0
      spec/friends-ops-spec.js
  4. 1 0
      spec/misc-ops-spec.js
  5. 1 3
      spec/user-ops-spec.js

+ 23 - 14
index.js

37
   };
37
   };
38
 };
38
 };
39
 
39
 
40
-// ensure log directory exists
41
-fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
40
+/*istanbul ignore if*/
41
+if (production === "-p") {
42
+  // ensure log directory exists
43
+  fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)
42
 
44
 
43
-// create a rotating write stream
44
-var accessLogStream = FileStreamRotator.getStream({
45
-  date_format: 'YYYYMMDD',
46
-  filename: logDirectory + '/access-%DATE%.log',
47
-  frequency: 'daily',
48
-  verbose: false
49
-})
45
+  // create a rotating write stream
46
+  var accessLogStream = FileStreamRotator.getStream({
47
+    date_format: 'YYYYMMDD',
48
+    filename: logDirectory + '/access-%DATE%.log',
49
+    frequency: 'daily',
50
+    verbose: false
51
+  })
50
 
52
 
51
-// setup the logger
52
-app.use(morgan('short', {stream: accessLogStream}))
53
-app.use(morgan('short'));
53
+  // setup the logger
54
+  app.use(morgan('short', {stream: accessLogStream}))
55
+  app.use(morgan('short'));
56
+}
54
 
57
 
55
 app.use(function(req, res, next) {
58
 app.use(function(req, res, next) {
56
   res.header("Access-Control-Allow-Origin", "*");
59
   res.header("Access-Control-Allow-Origin", "*");
68
   app.use('/log', auth, serveIndex('log', {'icons': true}));
71
   app.use('/log', auth, serveIndex('log', {'icons': true}));
69
 }
72
 }
70
 
73
 
71
-app.listen(3000, function () {
74
+var server = app.listen(3000, function () {
72
   console.log('Now accepting connections on port 3000.');
75
   console.log('Now accepting connections on port 3000.');
73
 });
76
 });
74
 
77
 
92
 process.on('SIGINT', function() {
95
 process.on('SIGINT', function() {
93
   console.log( "\nRecieved Ctrl-C, shutting down." );
96
   console.log( "\nRecieved Ctrl-C, shutting down." );
94
   process.exit(0);
97
   process.exit(0);
95
-})
98
+});
99
+
100
+module.exports = {
101
+  close: function () {
102
+    server.close();
103
+  }
104
+};

+ 1 - 3
package.json

4
   "description": "Server for the IP project",
4
   "description": "Server for the IP project",
5
   "main": "index.js",
5
   "main": "index.js",
6
   "scripts": {
6
   "scripts": {
7
-    "pretest": "istanbul cover index.js > debug.log &",
8
-    "test": "sleep 2; node jasmine-runner.js; node utils/flushdb.js",
9
-    "posttest": "killall -2 node"
7
+    "test": "istanbul cover jasmine-runner.js && node utils/flushdb.js"
10
   },
8
   },
11
   "repository": {
9
   "repository": {
12
     "type": "git",
10
     "type": "git",

+ 2 - 0
spec/friends-ops-spec.js

1
 var request = require("request");
1
 var request = require("request");
2
 var base_url = "http://localhost:3000";
2
 var base_url = "http://localhost:3000";
3
+var server = require("../index.js");
3
 
4
 
4
 describe("Friends Operations", function () {
5
 describe("Friends Operations", function () {
5
 
6
 
137
         expect(response.statusCode).toBe(200);
138
         expect(response.statusCode).toBe(200);
138
         expect(body.success).toBe(0);
139
         expect(body.success).toBe(0);
139
         expect(body.error).toBe(3);
140
         expect(body.error).toBe(3);
141
+        server.close();
140
         done();
142
         done();
141
       });
143
       });
142
     });
144
     });

+ 1 - 0
spec/misc-ops-spec.js

1
 var request = require("request");
1
 var request = require("request");
2
 var base_url = "http://localhost:3000";
2
 var base_url = "http://localhost:3000";
3
+var server = require("../index.js");
3
 
4
 
4
 describe("Misc Operations", function () {
5
 describe("Misc Operations", function () {
5
   describe("GET /hello/:name", function () {
6
   describe("GET /hello/:name", function () {

+ 1 - 3
spec/user-ops-spec.js

32
       request(register_user("foo123"), function (error, response, body) {
32
       request(register_user("foo123"), function (error, response, body) {
33
         expect(response.statusCode).toBe(200);
33
         expect(response.statusCode).toBe(200);
34
         expect(body.registered).toBe(1);
34
         expect(body.registered).toBe(1);
35
-        if (body["auth-key"]) {
36
-          expect(body["auth-key"].length).toBe(60);
37
-        }
35
+        expect(body["auth-key"].length).toBe(60);
38
         expect(body.error).toBe(0);
36
         expect(body.error).toBe(0);
39
         done();
37
         done();
40
       });
38
       });