fixed previous test, added test for removal of old entries.

thimovss · thimovss · commit 35998ffe6f27 · 2016-09-07T12:12:45.000+08:00
diff --git a/app/imports/server/api/endpoints.app-test.js b/app/imports/server/api/endpoints.app-test.js
@@ -4,15 +4,14 @@ import { chai } from 'meteor/practicalmeteor:chai';
 var assert = chai.assert,
     expect = chai.expect;
 
-const CorrectTable = 'IP address       HW type     Flags       HW address            Mask     Device\r\n192.168.1.11     0x1         0x2         8c:3a:e3:93:83:93     *        br0\r\n192.168.1.50     0x1         0x2         00:26:bb:07:54:80     *        br0\r\n192.168.1.18     0x1         0x2         3c:15:c2:cc:dc:2a     *        br0';
-
+const ThreeEntries = 'IP address       HW type     Flags       HW address            Mask     Device\r\n192.168.1.11     0x1         0x2         8c:3a:e3:93:83:93     *        br0\r\n192.168.1.50     0x1         0x2         00:26:bb:07:54:80     *        br0\r\n192.168.1.18     0x1         0x2         3c:15:c2:cc:dc:2a     *        br0';
+const TwoEntries = 'IP address       HW type     Flags       HW address            Mask     Device\r\n192.168.1.11     0x1         0x2         8c:3a:e3:93:83:93     *        br0\r\n192.168.1.50     0x1         0x2         00:26:bb:07:54:80     *        br0';
 describe('API', function() {
 
     it('accepts correct call', function() {
         HTTP.call(
             'POST',
-            Meteor.absoluteUrl() + 'routerapi/v1/arp/candra', 
-            { headers: { 'Authorization': 'Bearer abcd' }, data: { arpTable: CorrectTable } },
+            Meteor.absoluteUrl() + 'routerapi/v1/arp/candra', { headers: { 'Authorization': 'Bearer abcd' }, data: { arpTable: ThreeEntries } },
             function(error, result) {
                 assert(!error, 'there was an error: \n' + error);
                 assert(result.statusCode == 200, 'Status code didn\'t match 200 it was ' + result.statusCode);
@@ -77,4 +76,26 @@ describe('API', function() {
                 done();
             });
     });
+
+    it('removes old MAC addresses', function() {
+      var entriesBefore;
+        HTTP.call(
+            'POST',
+            Meteor.absoluteUrl() + 'routerapi/v1/arp/candra', { headers: { 'Authorization': 'Bearer abcd' }, data: { arpTable: ThreeEntries } },
+            function(error, result) {
+                assert(!error, 'there was an error: \n' + error);
+                assert(result.statusCode == 200, 'Status code didn\'t match 200 it was ' + result.statusCode);
+                entriesBefore = App.Collections.ARPEntries.find().count();
+            }
+        );
+        HTTP.call(
+            'POST',
+            Meteor.absoluteUrl() + 'routerapi/v1/arp/candra', { headers: { 'Authorization': 'Bearer abcd' }, data: { arpTable: TwoEntries } },
+            function(error, result) {
+                assert(!error, 'there was an error: \n' + error);
+                assert(result.statusCode == 200, 'Status code didn\'t match 200 it was ' + result.statusCode);
+                assert(App.Collections.ARPEntries.find().count() == entriesBefore - 1, 'An entry was not removed correctly');
+            }
+        );
+    });
 });
diff --git a/app/server/api/endpoints.js b/app/server/api/endpoints.js
@@ -82,7 +82,7 @@ RouterApi.addRoute(
                     statusCode: 400,
                     body: {
                         success: false,
-                        message: 'invalid request, missing arpTable body: \n ' + JSON.stringify(request.body)
+                        message: 'invalid request, missing arpTable'
                     }
                 };
             }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ RouterApi.addRoute(`
`82`	`82`	`statusCode: 400,`
`83`	`83`	`body: {`
`84`	`84`	`success: false,`
`85`		`- message: 'invalid request, missing arpTable body: \n ' + JSON.stringify(request.body)`
	`85`	`+ message: 'invalid request, missing arpTable'`
`86`	`86`	`}`
`87`	`87`	`};`
`88`	`88`	`}`