Merge branch 'gitlab'

.gitlab-ci.yml

@@ -0,0 +1,19 @@
+image: node:6-slim
+services:
+  - mongo
+
+before_script:
+  - npm install
+
+test:
+  stage: test
+  script:
+    - npm test
+  tags:
+    - docker
+
+cache:
+  key: "$CI_BUILD_REF_NAME"
+  untracked: true
+  paths:
+  - node_modules

package.json

@@ -7,7 +7,7 @@
     "build": "babel -d public/views views",
     "cover": "istanbul cover _mocha -- --require babel-core/register --require co-mocha test/**/*.js",
     "start": "node -r babel-core/register app.js",
-    "test": "mocha --require co-mocha --compilers js:babel-core/register test/**/*.js --timeout=10000",
+    "test": "mocha --require co-mocha --compilers js:babel-core/register test/**/*.js --timeout=15000",
     "watch": "parallelshell \"npm run watch-js\" \"npm run watch-server\"",
     "watch-js": "babel -wd public/views views",
     "watch-server": "nodemon -x \"node -r babel-core/register\" -e js,jsx -i public/ -i chrome/ app.js",

test/services/itunes.js

@@ -16,8 +16,8 @@ describe('iTunes Music', function(){
 
   describe('search', function(){
     it('should find album by search', function* (){
-      const result = yield itunes.search({type: 'album', artist: {name: 'Deftones'}, name: 'Deftones'});
+      const result = yield itunes.search({type: 'album', artist: {name: 'Deftones'}, name: 'White Pony'});
-      result.name.should.equal('Deftones');
+      result.name.should.equal('White Pony');
     });
 
     it('should find track by search', function* (){