From b41610e1a3de75469f6fc23d284076c43f0eac27 Mon Sep 17 00:00:00 2001 From: Gildas Date: Fri, 25 Sep 2015 12:29:32 +0200 Subject: [PATCH 1/2] =?UTF-8?q?Fixed=20Build=20&=20demo:=20-=20[x]=C2=A0Re?= =?UTF-8?q?store=20sinon=201.14.1=20(1.16=20isn't=20working).=20-=20[x]=20?= =?UTF-8?q?Remove=20symlinked=20sinon=20from=20example=20build=20-=20[x]?= =?UTF-8?q?=20Fixed=20makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- examples/blog/build/sinon-server.js | 1 - package.json | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 120000 examples/blog/build/sinon-server.js diff --git a/Makefile b/Makefile index 241f0e12..fdde9c5e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ install: ./node_modules/protractor/bin/webdriver-manager update run: - @cp node_modules/sinon/pkg/sinon-server.js examples/blog/build + @cp node_modules/sinon/pkg/sinon-server-1.14.1.js examples/blog/build/sinon-server.js @./node_modules/webpack-dev-server/bin/webpack-dev-server.js --colors --devtool cheap-module-inline-source-map --content-base examples/blog --port 8000 build: diff --git a/examples/blog/build/sinon-server.js b/examples/blog/build/sinon-server.js deleted file mode 120000 index 53f58957..00000000 --- a/examples/blog/build/sinon-server.js +++ /dev/null @@ -1 +0,0 @@ -../../../node_modules/sinon/pkg/sinon-server-1.14.1.js \ No newline at end of file diff --git a/package.json b/package.json index f023ba7a..b9e1eabf 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "rangy": "^1.3.0", "restangular": "^1.5.1", "sass-loader": "^0.5.0", - "sinon": "^1.16.1", + "sinon": "~1.14.1", "style-loader": "^0.12.2", "superagent": "^0.18.2", "textangular": "1.4.3", From 7e9f0c2cc3437a1a3abdd35b642988509cd7cf17 Mon Sep 17 00:00:00 2001 From: Gildas Date: Fri, 25 Sep 2015 15:10:29 +0200 Subject: [PATCH 2/2] use sinon 14.1 in grunt too --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7bfcf974..01092dc4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -24,7 +24,7 @@ module.exports = function (grunt) { dest: 'src/javascripts/test/fixtures/examples/blog/build/fakerest.js' }, test_sinon_server: { - src: 'node_modules/sinon/pkg/sinon-server-1.16.1.js', + src: 'node_modules/sinon/pkg/sinon-server-1.14.1.js', dest: 'src/javascripts/test/fixtures/examples/blog/build/sinon-server.js' } },