This is an automated email from the git hooks/post-receive script. New commit to branch feature/unitTest in repository pollen. See http://git.chorem.org/pollen.git commit 04e53e001a9d1392bf9ec589dc1c3d8c7c098a7b Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Jul 15 17:26:39 2014 +0200 fix dependence --- pollen-ui-angular/bower.json | 3 +++ pollen-ui-angular/package.json | 5 ++++- pollen-ui-angular/pom.xml | 32 ++++++++++++++++++++++++-------- pollen-ui-angular/src/test/karma.conf.js | 1 + 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index c2d33f7..7261c1b 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -20,5 +20,8 @@ "jqplot": "*", "ckeditor": "4.4.2", "less": "1.7.3" + }, + "devDependencies": { + "angular-mocks": "1.2.16" } } diff --git a/pollen-ui-angular/package.json b/pollen-ui-angular/package.json index 5ff1f26..db0d1c6 100644 --- a/pollen-ui-angular/package.json +++ b/pollen-ui-angular/package.json @@ -15,5 +15,8 @@ "test": "karma start src/test/karma.conf.js" }, "author": "garandel", - "license": "AGPL" + "license": "AGPL", + "dependencies": { + "bower": "^1.3.8" + } } diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index ff50ec3..f224a33 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -26,22 +26,37 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.3.1</version> <executions> <execution> + <id>npm</id> <phase>generate-sources</phase> <goals> <goal>exec</goal> </goals> + <configuration> + <executable>npm</executable> + <arguments> + <argument>install</argument> + </arguments> + <workingDirectory>${basedir}</workingDirectory> + </configuration> + </execution> + + <execution> + <id>bower</id> + <phase>generate-sources</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>bower</executable> + <arguments> + <argument>install</argument> + </arguments> + <workingDirectory>${basedir}</workingDirectory> + </configuration> </execution> </executions> - <configuration> - <executable>bower</executable> - <arguments> - <argument>install</argument> - </arguments> - <workingDirectory>${basedir}</workingDirectory> - </configuration> </plugin> <plugin> @@ -81,6 +96,7 @@ <configuration> <karmaExecutable>${basedir}/node_modules/karma/bin/karma</karmaExecutable> <configFile>src/test/karma.conf.js</configFile> + <junitReportFile>target/test-results.xml</junitReportFile> <reportsDirectory>${project.build.directory}/karma-reports</reportsDirectory> <browsers>PhantomJS</browsers> <autoWatch>false</autoWatch> diff --git a/pollen-ui-angular/src/test/karma.conf.js b/pollen-ui-angular/src/test/karma.conf.js index 7274e8e..69eca3a 100644 --- a/pollen-ui-angular/src/test/karma.conf.js +++ b/pollen-ui-angular/src/test/karma.conf.js @@ -15,6 +15,7 @@ module.exports = function(config) { // list of files / patterns to load in the browser files: [ + 'src/main/webapp/js/conf.js.exemple', // fix conf is not defined for controller 'src/main/webapp/lib/jquery/dist/jquery.min.js', 'src/main/webapp/lib/jqplot/jquery.jqplot.min.js', 'src/main/webapp/lib/jqplot/plugins/jqplot.barRenderer.min.js', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.