Merge 5c7a1ac into 61fe603

.eslintrc.json

@@ -4,15 +4,14 @@
     "node": true,
     "mocha": true
   },
-  "extends": "airbnb",
+  "extends": "airbnb-base",
   "plugins": [
     "standard",
     "promise"
   ],
   "rules": {
+    "prefer-destructuring": "warn",
     "one-var": "off",
-    "indent": "off",
-    "padded-blocks": "off",
     "no-plusplus": "off",
     "arrow-spacing": "off",
     "object-curly-spacing": "off",
@@ -24,7 +23,7 @@
     "no-multi-spaces": "off",
     "linebreak-style": [
       "error",
-      "windows"
+      "unix"
     ]
   }
-}
+}

.npmignore

@@ -0,0 +1,4 @@
+package-lock.json
+coverage
+node_modules
+.travis.yml

.travis.yml

@@ -1,9 +1,10 @@
 language: node_js
 node_js:
   - "4"
+  - "5"
   - "6"
   - "7"
-  - "node"
-  - "iojs"
+  - "8"
+  - "9"
 after_success:
-  - npm run coverage && npm run coveralls
+  - npm run coverage && npm run coveralls

README.md

@@ -76,7 +76,6 @@ or include it in your node.js module and use like this:
   let server = new TelegramServer(serverConfig);
   server.start().then(()=>yourTests());
 ```
-
 ### Options
 
 You can pass options like this:
@@ -118,21 +117,43 @@ Client emulation is very easy. You can use built in client class:
 Or you can take a look at `src/modules/telegramClient` and make client in any 
 language you want.
 
+### Stop server
+```js
+server.stop().then(()=>doMore());
+```
+Please beware that server needs much time (about 4 seconds) to stop (that's express issue).
+
 ### Full sample
 Your test code can look like this:
 ```js
+const TelegramServer = require('telegram-test-api');
+const TelegramBot = require('node-telegram-bot-api');
+
+describe('Telegram bot test', () => {
+  let serverConfig = {port: 9001};
+  const token = 'sampleToken';
+  let server;
+  let client;
+  beforeEach(() => {
+    server = new TelegramServer(serverConfig);
+    return server.start().then(() => {
+      client = server.getClient(token);
+    });
+  });
+
+  afterEach(function () {
+    this.slow(2000);
+    this.timeout(10000);
+    return server.stop();
+  });
+
   it('should greet Masha and Sasha', function testFull() {
     this.slow(400);
     this.timeout(800);
-    let serverConfig = {port: 9000};
-    let server = new TelegramServer(serverConfig);
-    let token = 'sampleToken';
-    let client = server.getClient(token);
     let message = client.makeMessage('/start');
     let telegramBot,
         testBot;
-    return server.start()
-      .then(()=> client.sendMessage(message))
+    return client.sendMessage(message)
       .then(()=> {
         let botOptions = {polling: true, baseApiUrl: server.ApiURL};
         telegramBot = new TelegramBot(token, botOptions);
@@ -160,4 +181,5 @@ Your test code can look like this:
         return true;
       })
   });
+});
 ```

bin/start.js

@@ -1,6 +1,6 @@
-const
-  TelegramServer = require('../index'),
-  config         = require('../config/config.json'),
-  server         = new TelegramServer(config);
-
-server.start();
+const
+  TelegramServer = require('../index'),
+  config = require('../config/config.json'),
+  server = new TelegramServer(config);
+
+server.start();

index.js

@@ -1,13 +1,13 @@
-/**
- * If running on Nodejs 5.x and below, we load the transpiled code.
- * Otherwise, we use the ES6 code.
- */
-
-/* eslint-disable global-require*/
-
-const majorVersion = parseInt(process.versions.node.split('.')[0], 10);
-if (majorVersion <= 5) {
-  module.exports = require('./lib/telegramServer');
-} else {
-  module.exports = require('./src/telegramServer');
-}
+/**
+ * If running on Nodejs below 6.4, we load the transpiled code.
+ * Otherwise, we use the ES6 code.
+ */
+
+/* eslint-disable global-require */
+const semver = require('semver');
+
+if (semver.satisfies(process.version, '>=6.4.0')) {
+  module.exports = require('./src/telegramServer');
+} else {
+  module.exports = require('./lib/telegramServer');
+}