hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-14 13:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load sinon & sinochai from tmp assets

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-02-28 00:54:47 +01:00
parent d9183d2f4f
commit e5106abd0b
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Gruntfile.js
View File

@@ -283,21 +283,6 @@ module.exports = function(grunt) {
"dest": "<%= path.asset %>/requirejs/", "dest": "<%= path.asset %>/requirejs/",
"flatten": true "flatten": true
}, },
"sinonjs": {
"expand": true,
"src": "<%= path.bower %>/sinonjs/sinon.js",
"dest": "<%= path.asset %>/sinon",
"flatten": true
},
"sinon-chai": {
"expand": true,
"src": [
"<%= path.bower %>/sinon-chai/lib/sinon-chai.js",
"<%= path.bower %>/sinon-chai/LICENSE.txt"
],
"dest": "<%= path.asset %>/sinon-chai",
"flatten": true
},
"swfobject": { "swfobject": {
"expand": true, "expand": true,
"src": "<%= path.bower %>/swfobject/swfobject/swfobject.js", "src": "<%= path.bower %>/swfobject/swfobject/swfobject.js",
@@ -429,8 +414,6 @@ module.exports = function(grunt) {
"copy:modernizr", "copy:modernizr",
"copy:normalize", "copy:normalize",
"copy:requirejs", "copy:requirejs",
"copy:sinonjs",
"copy:sinon-chai",
"copy:swfobject", "copy:swfobject",
"copy:tinymce", "copy:tinymce",
"copy:underscore", "copy:underscore",

2
www/scripts/tests/index.html
View File

@@ -8,7 +8,7 @@
<body> <body>
<div id="mocha"></div> <div id="mocha"></div>
<script src="./../../../tmp-assets/mocha/mocha.js"></script> <script src="./../../../tmp-assets/mocha/mocha.js"></script>
<script src="../../assets/sinon/sinon.js"></script> <script src="./../../../tmp-assets/sinonjs/sinon.js"></script>
<script src="../../assets/requirejs/require.js"></script> <script src="../../assets/requirejs/require.js"></script>
<script src="../../scripts/tests/main.js"></script> <script src="../../scripts/tests/main.js"></script>
<script> <script>

2
www/scripts/tests/main.js
View File

@@ -10,7 +10,7 @@ require.config({
backbone: "../assets/backbone-amd/backbone", backbone: "../assets/backbone-amd/backbone",
i18n: "../assets/i18next/i18next.amd-1.6.3", i18n: "../assets/i18next/i18next.amd-1.6.3",
bootstrap: "../assets/bootstrap/js/bootstrap.min", bootstrap: "../assets/bootstrap/js/bootstrap.min",
sinonchai: "../assets/sinon-chai/sinon-chai" sinonchai: "../../tmp-assets/sinon-chai/lib/sinon-chai"
}, },
shim: { shim: {
bootstrap: ["jquery"], bootstrap: ["jquery"],