From fff7207903464f7b394331b6ee20ae65bfc0644b Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Tue, 16 Feb 2016 15:21:38 +0000 Subject: [PATCH 1/3] Testing Gitlab CI runner --- .gitlab-ci.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..20aa5db --- /dev/null +++ b/.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 From 35b23a107bd01a5106d0ee4d0f8ab9c30fa74694 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Mon, 23 May 2016 20:18:16 +0100 Subject: [PATCH 2/3] Fix itunes test data --- test/services/itunes.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/services/itunes.js b/test/services/itunes.js index f129311..05af3c7 100644 --- a/test/services/itunes.js +++ b/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'}); - result.name.should.equal('Deftones'); + const result = yield itunes.search({type: 'album', artist: {name: 'Deftones'}, name: 'White Pony'}); + result.name.should.equal('White Pony'); }); it('should find track by search', function* (){ From cb8690166cea16f01aca5fa9d91a98ba7cf779f6 Mon Sep 17 00:00:00 2001 From: Jonathan Cremin Date: Mon, 23 May 2016 20:39:29 +0100 Subject: [PATCH 3/3] Deezer timeouts? --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 493c74d..75c56f3 100644 --- a/package.json +++ b/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"