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

Fix #1190 Use phantom JS to run qunit tests

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-05-30 19:42:44 +02:00
parent a5cc876959
commit acb66d6f92
5 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -63,6 +63,9 @@ matrix:
- php: 5.5 - php: 5.5
script: script:
- phantomjs www/assets/qunit/addons/phantomjs/runner.js www/include/js/tests/jquery.Upload.js.html
- phantomjs www/assets/qunit/addons/phantomjs/runner.js www/include/js/tests/jquery.Edit.js.html
- phantomjs www/assets/qunit/addons/phantomjs/runner.js www/include/js/tests/jquery.Selection.js.html
- sh tests/js/scripts/run.sh --single-run - sh tests/js/scripts/run.sh --single-run
- mocha-phantomjs www/scripts/tests/index.html - mocha-phantomjs www/scripts/tests/index.html
- phpunit - phpunit

2
component.json
View File

@@ -15,7 +15,7 @@
"json3" : "3.2.4", "json3" : "3.2.4",
"bootstrap-switch": "https://github.com/nostalgiaz/bootstrap-switch.git", "bootstrap-switch": "https://github.com/nostalgiaz/bootstrap-switch.git",
"humane-js": "~3.0.6", "humane-js": "~3.0.6",
"qunit": "~1.11.0", "qunit": "https://github.com/jquery/qunit.git#1.11.0",
"mustache": "~0.7.2", "mustache": "~0.7.2",
"jquery-file-upload": "https://github.com/blueimp/jQuery-File-Upload/archive/75d11179fd9c248c061c8eb428782bb556c8db0a.zip", "jquery-file-upload": "https://github.com/blueimp/jQuery-File-Upload/archive/75d11179fd9c248c061c8eb428782bb556c8db0a.zip",
"blueimp-load-image": "latest", "blueimp-load-image": "latest",

6
www/include/js/tests/jquery.Edit.js.html
View File

@@ -3,10 +3,10 @@
<head> <head>
<title></title> <title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="http://code.jquery.com/jquery-latest.js"></script> <script src="../../../assets/jquery/jquery.js"></script>
<script src="/include/vendor/qunit/qunit/qunit.js"></script> <script src="../../../assets/qunit/qunit/qunit.js"></script>
<script src="../jquery.Edit.js"></script> <script src="../jquery.Edit.js"></script>
<link type="text/css" rel="stylesheet" href="/assets/qunit/qunit.css"/> <link type="text/css" rel="stylesheet" href="../../../assets/qunit/qunit/qunit.css"/>
<script> $(document).ready(function(){ <script> $(document).ready(function(){

6
www/include/js/tests/jquery.Selection.js.html
View File

@@ -3,10 +3,10 @@
<head> <head>
<title></title> <title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="http://code.jquery.com/jquery-latest.js"></script> <script src="../../../assets/jquery/jquery.js"></script>
<script src="/include/vendor/qunit/qunit/qunit.js"></script> <script src="../../../assets/qunit/qunit/qunit.js"></script>
<script src="../jquery.Selection.js"></script> <script src="../jquery.Selection.js"></script>
<link type="text/css" rel="stylesheet" href="/assets/qunit/qunit.css"/> <link type="text/css" rel="stylesheet" href="../../../assets/qunit/qunit.css"/>
<script> $(document).ready(function(){ <script> $(document).ready(function(){

10
www/include/js/tests/jquery.Upload.js.html
View File

@@ -3,12 +3,12 @@
<head> <head>
<title></title> <title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="http://code.jquery.com/jquery-latest.js"></script> <script src="../../../assets/jquery/jquery.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.18/jquery-ui.js"></script> <script src="../../jslibs/jquery-ui-1.8/js/jquery-ui-1.8.17.custom.min.js"></script>
<script src="/include/vendor/qunit/qunit/qunit.js"></script> <script src="../../../assets/qunit/qunit/qunit.js"></script>
<script src="/include/jslibs/blueimp.load-image.js"></script> <script src="../../../assets/blueimp-load-image/load-image.js"></script>
<script src="../../../skins/prod/jquery.Upload.js"></script> <script src="../../../skins/prod/jquery.Upload.js"></script>
<link type="text/css" rel="stylesheet" href="/assets/qunit/qunit.css"/> <link type="text/css" rel="stylesheet" href="../../../assets/qunit/qunit/qunit.css"/>
<script> $(document).ready(function(){ <script> $(document).ready(function(){
var getUploadManager = function(){ var getUploadManager = function(){