fix(callback): fix typo on cancel function

closes #1, typo fixed #1
miketrebilcock · Mar 27, 2017 · f7a0338 · f7a0338
1 parent fc40f6f
commit f7a0338
Show file tree

Hide file tree

Showing 48 changed files with 74 additions and 2 deletions.
diff --git a/.bithoundrc b/.bithoundrc
diff --git a/.eslintrc b/.eslintrc
diff --git a/.gitignore b/.gitignore
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/js-pigpiod.iml b/.idea/js-pigpiod.iml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/.jsinitrc b/.jsinitrc
diff --git a/.npmignore b/.npmignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENCE.txt b/LICENCE.txt
diff --git a/README.md b/README.md
diff --git a/docs/-_callback.html b/docs/-_callback.html
diff --git a/docs/-_callback.js.html b/docs/-_callback.js.html
diff --git a/docs/Pigpio.html b/docs/Pigpio.html
diff --git a/docs/definitions.js.html b/docs/definitions.js.html
diff --git a/docs/global.html b/docs/global.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/index.js.html b/docs/index.js.html
diff --git a/docs/pigpio.html b/docs/pigpio.html
diff --git a/docs/scripts/linenumber.js b/docs/scripts/linenumber.js
diff --git a/docs/scripts/prettify/Apache-License-2.0.txt b/docs/scripts/prettify/Apache-License-2.0.txt
diff --git a/docs/scripts/prettify/lang-css.js b/docs/scripts/prettify/lang-css.js
diff --git a/docs/scripts/prettify/prettify.js b/docs/scripts/prettify/prettify.js
diff --git a/docs/styles/jsdoc.css b/docs/styles/jsdoc.css
diff --git a/docs/styles/prettify.css b/docs/styles/prettify.css
diff --git a/examples/edge_detection.js b/examples/edge_detection.js
diff --git a/examples/getHardwareRevision.js b/examples/getHardwareRevision.js
diff --git a/examples/js-pwm.js b/examples/js-pwm.js
diff --git a/examples/test_read_write.js b/examples/test_read_write.js
diff --git a/js-pigpio/_callback.js b/js-pigpio/_callback.js
@@ -84,7 +84,7 @@ class _callback {
      */
     cancel () {
         "use strict";
-        this._notfy.remove(this._callback);
+        this._notify.remove(this._callback);
     }
 
     /**

diff --git a/js-pigpio/definitions.js b/js-pigpio/definitions.js
diff --git a/js-pigpio/index.js b/js-pigpio/index.js
diff --git a/js-pigpio/utils.js b/js-pigpio/utils.js
diff --git a/jsdoc.json b/jsdoc.json
diff --git a/package.json b/package.json
diff --git a/test/eslint.spec.js b/test/eslint.spec.js
diff --git a/test/mocha.opts b/test/mocha.opts
diff --git a/test/pigpio.advanced.spec.js b/test/pigpio.advanced.spec.js
@@ -8,7 +8,7 @@ let server;
 
 describe('advanced', () => {
 
-    const port = 5001;
+    const port = 5031;
 
     before(()=> {
         server = new testServer(port);

diff --git a/test/pigpio.beginner.spec.js b/test/pigpio.beginner.spec.js
diff --git a/test/pigpio.essential.spec.js b/test/pigpio.essential.spec.js
diff --git a/test/pigpio.intermediate.spec.js b/test/pigpio.intermediate.spec.js
diff --git a/test/pigpio.utils.spec.js b/test/pigpio.utils.spec.js
diff --git a/test/testhelper.js b/test/testhelper.js
diff --git a/test/utils.spec.js b/test/utils.spec.js
@@ -1,8 +1,11 @@
 /*global it describe context */
 
 const assert = require('chai').assert;
+const expect = require('chai').expect;
 const reverse_string_and_clean = require('../js-pigpio/utils.js').reverse_string_and_clean;
 const reverse_string = require('../js-pigpio/utils.js').reverse_string;
+const _socklock = require('../js-pigpio/utils.js')._socklock;
+const _pi_gpio_command = require('../js-pigpio/utils.js')._pi_gpio_command;
 
 describe('js-pigpio-utils', () => {
 
@@ -20,4 +23,73 @@ describe('js-pigpio-utils', () => {
 
         });
     });
+
+    context('_socklock class', () => {
+        it('initialises with parameters', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            assert(test.host === '192.168.1.1', 'Host was not held');
+            assert(test.port === 5000, 'Port was not held');
+        });
+        it('Places only one lock on a server and port', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            test._acquireLock();
+            test._acquireLock();
+            expect((done) => {
+                test._acquireLock();
+                done();
+            }).to.throw(Error);
+        });
+        it('Places more than one lock on a server', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            const test2 = new _socklock('192.168.1.1',5001);
+            const test3 = new _socklock('192.168.1.1',5002);
+            test._acquireLock();
+            test2._acquireLock();
+            test3._acquireLock();
+        });
+        it('locks, releases and relocks on a server and port', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            test._acquireLock();
+            test._releaseLock();
+            test._acquireLock();
+            expect((done) => {
+                test._acquireLock();
+                done();
+            }).to.throw(Error);
+        });
+    });
+
+    context('_pi_gpio_command', () => {
+        it('checks that socketlock is present', () => {
+            const test = {};
+            expect(() => {
+                _pi_gpio_command(test, 0, 0, 0);
+            }).to.throw(Error);
+        });
+
+        it('checks that command is present', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            expect(() => {
+                _pi_gpio_command(test);
+            }).to.throw(Error);
+        });
+
+        it('reports an error when data send fails', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            test.s = {write(){return false;}};
+            expect(() => {
+                _pi_gpio_command(test,1);
+            }).to.throw(Error);
+        });
+
+        it('places a lock', () => {
+            const test = new _socklock('192.168.1.1',5000);
+            test.s = {write(){return true;}};
+            _pi_gpio_command(test,1,0,0,0,true);
+            expect(() => {
+                test._acquireLock();
+            }).to.throw(Error);
+        });
+
+    });
 });