From 0386d5c1e0c7e6b5d1c91a45e48e79fa148da104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Burnichon?= <bburnichon@alchemy.fr>
Date: Thu, 26 Mar 2015 15:27:35 +0100
Subject: [PATCH] Update Travis conf and js testing

---
 .travis.yml   | 27 +++++++++++++++------------
 Gruntfile.js  | 13 +++----------
 composer.lock |  2 +-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index da8ad02421..6f9f716fb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,32 +33,35 @@ before_install:
   - yes | pecl install imagick
 
 install:
+  - npm --version
+  - travis_retry npm install
   - travis_retry composer install --optimize-autoloader --dev --prefer-source
-  - travis_retry grunt install-assets
+  - travis_retry ./node_modules/.bin/grunt install-assets
   - ./bin/developer assets:compile-less
 
 before_script:
-  - node --version
-  - npm --version
-  - travis_retry npm install
-  - mysql -e 'create database update39_test;create database ab_test;create database db_test;'
-  - mysql -e 'SET @@global.sql_mode= STRICT_ALL_TABLES;'
-  - mysql -e 'SET @@global.max_allowed_packet= 33554432;'
-  - mysql -e 'SET @@global.wait_timeout= 999999;'
-
-script:
+  - >
+    mysql -e '
+    CREATE DATABASE update39_test;
+    CREATE DATABASE ab_test;
+    CREATE DATABASE db_test;
+    SET @@global.sql_mode= STRICT_ALL_TABLES;
+    SET @@global.max_allowed_packet= 33554432;
+    SET @@global.wait_timeout= 999999;
+    '
   - ./bin/developer system:uninstall
   - ./bin/setup system:install --email=test@phraseanet.com --password=test --db-user=root --db-template=fr --db-password= --databox=db_test --appbox=ab_test --server-name=http://127.0.0.1 -y;
-  - mysql -e 'SELECT version FROM ab_test.sitepreff \G'
-  - mysql -e 'SELECT * FROM db_test.pref WHERE prop = "version" \G'
   - >
     if [ "$SETUP_MODE" = "update" ]; then
       ./bin/developer ini:reset --email=test@phraseanet.com --password=test --run-patches --no-setup-dbs;
       php resources/hudson/cleanupSubdefs.php;
     fi
+  - mysql -e 'SELECT ab.version AS applibox_version, db.value AS databox_version FROM ab_test.sitepreff ab, db_test.pref db WHERE db.prop = "version"'
   - ./bin/developer ini:setup-tests-dbs
   - ./bin/console searchengine:index:create
   - ./bin/developer phraseanet:regenerate-sqlite
   - ./bin/developer phraseanet:generate-js-fixtures
+
+script:
   - ./node_modules/.bin/grunt test
   - ./bin/phpunit
diff --git a/Gruntfile.js b/Gruntfile.js
index df13011b63..59566a8b32 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -30,14 +30,6 @@ module.exports = function(grunt) {
                 }
             }
         },
-        shell : {
-            generate_js_fixtures: {
-                options: {
-                    stdout: true
-                },
-                command  : 'bin/developer phraseanet:generate-js-fixtures'
-            }
-        },
         bower_postinst: {
             dist: {
                 options: {
@@ -439,5 +431,6 @@ module.exports = function(grunt) {
         "copy-assets",
         "clean:bower"
     ]);
-    grunt.registerTask('test', ["shell:generate_js_fixtures", "qunit", "mocha_phantomjs"]);
-};
\ No newline at end of file
+    // js fixtures should be present (./bin/developer phraseanet:generate-js-fixtures)
+    grunt.registerTask('test', ["qunit", "mocha_phantomjs"]);
+};
diff --git a/composer.lock b/composer.lock
index 7e70bf5881..414eefd289 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "3ecc359e45901eca385f83233299d840",
+    "hash": "92474e976576454608ed9d95a2bd5362",
     "packages": [
         {
             "name": "alchemy-fr/tcpdf-clone",