From 7cf44298b530df8f7217274853c3a710fa20f02d Mon Sep 17 00:00:00 2001 From: alexisjanvier Date: Mon, 29 Feb 2016 11:48:32 +0100 Subject: [PATCH 1/6] Fix tests --- src/javascripts/test/unit/Crud/column/maNumberColumnSpec.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/javascripts/test/unit/Crud/column/maNumberColumnSpec.js b/src/javascripts/test/unit/Crud/column/maNumberColumnSpec.js index df4672fd..ea8ea1cc 100644 --- a/src/javascripts/test/unit/Crud/column/maNumberColumnSpec.js +++ b/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, From ce3fca5498b1ecc93dd7f0b20f7aa6ab065fc14e Mon Sep 17 00:00:00 2001 From: alexisjanvier Date: Mon, 29 Feb 2016 13:50:04 +0100 Subject: [PATCH 2/6] Update angualar to 1.4 angular-mock, jasmine and protractor also --- package.json | 9 +++++---- src/javascripts/test/protractor.conf.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 49abd255..d8ebecfc 100644 --- a/package.json +++ b/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", @@ -40,7 +40,8 @@ "grunt-protractor-runner": "^1.2.1", "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", diff --git a/src/javascripts/test/protractor.conf.js b/src/javascripts/test/protractor.conf.js index 162ba863..a854c53b 100644 --- a/src/javascripts/test/protractor.conf.js +++ b/src/javascripts/test/protractor.conf.js @@ -14,7 +14,7 @@ exports.config = { name: 'ng-admin' } ], - + directConnect: true, jasmineNodeOpts: { onComplete: null, isVerbose: true, From ea833ef2052dc5fe6c42df051222c30b2e74d1c3 Mon Sep 17 00:00:00 2001 From: alexisjanvier Date: Mon, 29 Feb 2016 13:56:33 +0100 Subject: [PATCH 3/6] Update node on Travis --- .travis.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37eab2ef..a00c37d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ cache: - 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" diff --git a/package.json b/package.json index d8ebecfc..54608ce3 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "webpack-dev-server": "^1.10.1" }, "engines": { - "node": ">=0.10.0" + "node": ">=4.2.0" }, "scripts": { "test": "make test" From fe0bbed3c4e6e7806d7fbfaef2c301a264291ac2 Mon Sep 17 00:00:00 2001 From: alexisjanvier Date: Mon, 29 Feb 2016 14:03:19 +0100 Subject: [PATCH 4/6] Fix travis config --- .travis.yml | 6 ++++++ src/javascripts/test/protractor.conf.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a00c37d8..683cd4a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,17 @@ 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: diff --git a/src/javascripts/test/protractor.conf.js b/src/javascripts/test/protractor.conf.js index a854c53b..b5884d1c 100644 --- a/src/javascripts/test/protractor.conf.js +++ b/src/javascripts/test/protractor.conf.js @@ -14,7 +14,7 @@ exports.config = { name: 'ng-admin' } ], - directConnect: true, + directConnect: !process.env.CI, jasmineNodeOpts: { onComplete: null, isVerbose: true, From 35ecd3d5a248d265c0da8eca2a6798a8a46116f1 Mon Sep 17 00:00:00 2001 From: alexisjanvier Date: Mon, 29 Feb 2016 18:17:28 +0100 Subject: [PATCH 5/6] Update grunt protractor --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 54608ce3..9fd8753f 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "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": "~2.4.1", From a02e1642fa0c828f8c1f5a564738916684a3a66c Mon Sep 17 00:00:00 2001 From: alexisjanvier Date: Tue, 1 Mar 2016 09:55:31 +0100 Subject: [PATCH 6/6] Update readme about angular version --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 1306909a..ac293778 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,10 @@ Add the `ng-admin.min.css` and `ng-admin.min.js` to the HTML, add a `
``` +### 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.