Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Commit

Permalink
Merged release/v0.2.0-alpha into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Kocal committed Sep 13, 2016
2 parents c61a7f7 + bed8ff3 commit e7a6eef
Show file tree
Hide file tree
Showing 41 changed files with 3,625 additions and 1,228 deletions.
9 changes: 9 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"presets": [
"es2015"
],
"plugins": [
"array-includes",
"transform-object-assign"
]
}
36 changes: 36 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"env": {
"amd": true,
"browser": true,
"es6": true,
"jasmine": true,
"node": true
},
"extends": "eslint:recommended",
"rules": {
"no-console": 0,
"no-unused-vars": 1,
"indent": [
"error",
4
],
"linebreak-style": [
"error",
"unix"
],
"quotes": [
"error",
"single"
],
"semi": [
"error",
"never"
]
},
"parserOptions": {
"sourceType": "module"
},
"globals": {
"TornadoWebSocket": true
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@ jspm_packages
.node_repl_history

# Created by .ignore support plugin (hsz.mobi)
/doc/
3 changes: 3 additions & 0 deletions .idea/django-tornado-websockets-client.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 36 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js

sudo: required
dist: trusty

node_js:
- 5.1
Expand All @@ -9,21 +10,49 @@ addons:
firefox: "30.0"

env:
- BROWSER='Chrome'
- BROWSER='Firefox'
- BROWSER='Opera'
- BROWSER='Chrome' USE_ES6=false
- BROWSER='Chrome' USE_ES6=true
- BROWSER='Firefox' USE_ES6=false
- BROWSER='Firefox' USE_ES6=true
- BROWSER='Opera' USE_ES6=false
- BROWSER='Opera' USE_ES6=true

before_install:
- >
if [[ "$USE_ES6" == true ]]; then
wget -P /tmp/ https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
wget -P /tmp/ http://download1.operacdn.com/pub/opera/desktop/39.0.2256.48/linux/opera-stable_39.0.2256.48_amd64.deb
wget -P /tmp/ https://ftp.mozilla.org/pub/firefox/releases/45.0.2/linux-x86_64/fr/firefox-45.0.2.tar.bz2
fi
- >
if [[ "$USE_ES6" == false ]]; then
wget -P /tmp/ http://download1.operacdn.com/pub/opera/desktop/27.0.1689.54/linux/opera-stable_27.0.1689.54_amd64.deb
fi
install:
- wget http://download1.operacdn.com/pub/opera/desktop/27.0.1689.54/linux/opera-stable_27.0.1689.54_amd64.deb
- sudo dpkg -i opera-stable_27.0.1689.54_amd64.deb
- sudo apt-get update
# Download and install version of Chrome/Opera/Firefox which supports ES6 Class.
- >
if [[ "$USE_ES6" == true ]]; then
sudo apt-get install -y libappindicator1 fonts-liberation
sudo dpkg -i /tmp/google-chrome*.deb /tmp/opera-stable_39*.deb
mkdir /tmp/firefox-45.0.2
tar -xjf /tmp/firefox-45.0.2.tar.bz2 --directory /tmp/firefox-45.0.2
export PATH="/tmp/firefox-45.0.2/firefox:$PATH"
fi
# Just download Opera, Chromium and Firefox are already installed
- >
if [[ "$USE_ES6" == false ]]; then
sudo dpkg -i /tmp/opera-stable_27*.deb
fi
- npm install

before_script:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- echo "Firefox version => $(firefox -v)"
- echo "Chromium version => $(chromium-browser --version)"
- echo "Opera version => $(opera --version)"
- echo "Using ES6? => " $USE_ES6

script: npm test
script: npm test
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ JavaScript's WebSocket wrapper for [django-tornado-websockets](https://github.co
- Latest: http://django-tornado-websockets.readthedocs.io/en/latest/usage.html#using-websockets-client-side
- Develop: http://django-tornado-websockets.readthedocs.io/en/develop/usage.html#using-websockets-client-side

## Installation

1. `$ git clone <...>`
2. `$ npm install`
3. `# npm -g gulp`

## Running unit tests

1. Setup your `django-tornado-websockets` WebSocket application and [run Tornado server](http://django-tornado-websockets.readthedocs.io/en/stable/usage.html#run-tornado-server),
2. `$ npm install`,
3. `$ npm test`.
2. `$ npm test`.

## Running examples

Expand Down
Loading

0 comments on commit e7a6eef

Please sign in to comment.