Merge branch 'release/v0.2.0'

Kocal · Mar 18, 2017 · df37d29 · df37d29
2 parents 0d3a28c + b7bd5b7
commit df37d29
Show file tree

Hide file tree

Showing 13 changed files with 3,978 additions and 77 deletions.
diff --git a/.gitignore b/.gitignore
@@ -92,4 +92,5 @@ jspm_packages
 .node_repl_history
 
 # Created by .ignore support plugin (hsz.mobi)
+/.idea
 /doc/
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/django-tornado-websockets-client.iml b/.idea/django-tornado-websockets-client.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.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/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/examples/js/tws/modules b/examples/js/tws/modules
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "django-tornado-websockets-client",
-  "version": "0.2.0-beta",
+  "version": "0.2.0",
   "description": "Client-side library for django-tornado-websockets project",
   "scripts": {
     "test": "./node_modules/karma/bin/karma start karma.conf.js",

diff --git a/tests/module_test-es6.js b/tests/module_test-es6.js
@@ -1,7 +1,7 @@
 define(window.__env__['dependencies'], function (TornadoWebSocket) {
     describe('TornadoWebSocket.Module', function () {
 
-        var MyModule = class extends TornadoWebSocket.Module {
+        class MyModule extends TornadoWebSocket.Module {
             constructor(prefix) {
                 super(prefix)
             }
@@ -15,16 +15,16 @@ define(window.__env__['dependencies'], function (TornadoWebSocket) {
             })
 
             it('should be inherited by a sub class', function () {
-                var myModule = new MyModule('my_module')
+                let myModule = new MyModule('my_module')
 
                 expect(myModule._name).toBe('module_my_module')
             })
         })
 
         describe('on()', function () {
             it('should call tws.on() with a prefix', function () {
-                var tws = new TornadoWebSocket('path')
-                var myModule = new MyModule('my_module_')
+                let tws = new TornadoWebSocket('path')
+                let myModule = new MyModule('my_module_')
 
                 spyOn(tws, 'on')
 
@@ -37,8 +37,8 @@ define(window.__env__['dependencies'], function (TornadoWebSocket) {
 
         describe('emit()', function () {
             it('should call tws.emit() with a prefix', function () {
-                var tws = new TornadoWebSocket('path')
-                var myModule = new MyModule('my_module_')
+                let tws = new TornadoWebSocket('path')
+                let myModule = new MyModule('my_module_')
 
                 spyOn(tws, 'emit')
 
@@ -49,4 +49,4 @@ define(window.__env__['dependencies'], function (TornadoWebSocket) {
             })
         })
     })
-})
+})