Merge pull request #945 from marmelab/upgrade_angular_1_4

[RFR] Upgrade Angular from 1.3 to 1.4

.travis.yml

@@ -1,18 +1,24 @@
 env:
   global:
+    - CXX=g++-4.8
     - secure: Yp3LrtligD2LVcYK7xep9vPbOV9kDFixeY/TySYZM62WikYrKNUg54MHXI0FsbJ29Ay62W40uC6gIkWMq1cO1Ensj2Y4PzlFSM042vB8axHwJV6oMCNy4vHv1plt7vTXIv8+JSN0x3gPO4hhD4K39liKC5eARZLe3ObbcSsAgbU=
     - secure: dTO5DS3+XnjOub7MHyKeU6YdCIBEExOcaq57u3yx7JnLy9/eNrDXEe+oQUhRCb/w8egnqd8Nvmkq9095IQe8r+/zzR1AAE69affM1oPnP0n+LzvukjJDgm/ZYYLY9SY0EOZ4TNmKuT89gECYeCMp/dFAQdPNEBsmjtbk09/Kqyg=
 addons:
   sauce_connect: true
   hosts:
     - ngadmin
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 sudo: false
 cache:
   directories:
     - node_modules
 language: node_js
 node_js:
-  - "0.12"
+  - "4"
 before_install:
   - "export TZ=Europe/Paris" # Change timezone to test Date function more accurately
   - "export DISPLAY=:99.0"

README.md

@@ -48,6 +48,10 @@ Add the `ng-admin.min.css` and `ng-admin.min.js` to the HTML, add a `<div ui-vie
 </html>
 ```
 
+### Angular version
+The current ng-admin (master) uses **Angular 1.4**. If you need still being compatible with **Angular 1.3** you must use [ng-admin 0.9](https://github.com/marmelab/ng-admin/releases/tag/v0.9.1).
+You must also be attentive if you use some additional angular plugins in your code, Angular 1.4 causing some BC Breaks. For example it's the case for [angular-cookies](https://code.angularjs.org/1.4.9/docs/api/ngCookies/service/$cookies).
+
 ## Getting Started
 
 See the [Getting Started](doc/Getting-started.md) dedicated chapter for a step-by-step tutorial aimed at beginners.

package.json

@@ -10,9 +10,9 @@
   },
   "devDependencies": {
     "admin-config": "^0.11.0",
-    "angular": "~1.3.15",
+    "angular": "~1.4.8",
     "angular-bootstrap": "^0.12.0",
-    "angular-mocks": "1.3.14",
+    "angular-mocks": "~1.4.8",
     "angular-numeraljs": "^1.1.6",
     "angular-sanitize": "^1.3.15",
     "angular-ui-codemirror": "^0.3.0",
@@ -37,10 +37,11 @@
     "grunt-contrib-connect": "^0.8.0",
     "grunt-contrib-copy": "^0.6.0",
     "grunt-exec": "^0.4.6",
-    "grunt-protractor-runner": "^1.2.1",
+    "grunt-protractor-runner": "~3.0.0",
     "html-loader": "^0.3.0",
     "humane-js": "^3.2.2",
-    "jasmine-core": "~2.1.3",
+    "jasmine": "~2.4.1",
+    "jasmine-core": "~2.4.1",
     "jshint-stylish": "~0.1.3",
     "jsonlint": "^1.6.2",
     "karma": "~0.12.14",
@@ -61,7 +62,7 @@
     "nprogress": "^0.2.0",
     "numeral": "^1.5.3",
     "papaparse": "^4.1.1",
-    "protractor": "^1.8.0",
+    "protractor": "~3.1.1",
     "rangy": "^1.3.0",
     "restangular": "^1.5.1",
     "sass-loader": "^0.5.0",
@@ -76,7 +77,7 @@
     "webpack-dev-server": "^1.10.1"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=4.2.0"
   },
   "scripts": {
     "test": "make test"

src/javascripts/test/protractor.conf.js

@@ -14,7 +14,7 @@ exports.config =  {
             name: 'ng-admin'
         }
     ],
-
+    directConnect: !process.env.CI,
     jasmineNodeOpts: {
         onComplete: null,
         isVerbose: true,

src/javascripts/test/unit/Crud/column/maNumberColumnSpec.js

@@ -5,7 +5,9 @@ describe('directive: ma-number-column', function () {
     var directive = require('../../../../ng-admin/Crud/column/maNumberColumn');
     var NumberField = require('admin-config/lib/Field/NumberField');
 
-    angular.module('testapp_NumberColumn', ['ngNumeraljs']).directive('maNumberColumn', directive);
+    angular.module('testapp_NumberColumn', ['ngNumeraljs'])
+        .filter('ngNumeraljs', require('../../../../../../node_modules/angular-numeraljs/dist/angular-numeraljs.min.js'))
+        .directive('maNumberColumn', directive);
 
     var $compile,
         scope,