Commit d8984114 authored by julienmege's avatar julienmege Committed by Colin PUY

Fix dev env for windows

use './spec/**.spec.js' for sp protractor.conf
Fix windows environment issue on "postinstall"
BS-14333 Update protractor.conf for Windows
BS-14333 fix npm.cmd path issue

Closes #1746
parent 0b0a896f
......@@ -15,7 +15,7 @@
"scripts": {
"test": "gulp test && gulp test:datepicker --timezone='America/Los_Angeles' && gulp test:datepicker --timezone='Asia/Bangkok'",
"test-watch": "gulp test-watch",
"postinstall": "npm install --prefix gulp/widget-builder && bower install",
"postinstall": "npm install --ignore-script --prefix gulp/widget-builder && bower install",
"build": "gulp",
"pot": "gulp pot",
"serve": "gulp serve"
......
......@@ -46,7 +46,7 @@ module.exports = function(gulp, config) {
gulp.task('e2e', ['e2e:ReportScafold', 'build', 'bundle:e2e', 'index:e2e'], function () {
var server = serveE2e(paths);
return gulp.src(['test/e2e/spec/**/*.js'])
return gulp.src([])
.pipe(protractor({
configFile: 'test/e2e/protractor.conf.js',
args: ['--baseUrl', 'http://localhost:12001']
......
......@@ -2,5 +2,5 @@ REM This file is needed by npm-frontend-plugin since due to a bug, this plugin d
REM https://github.com/eirslett/frontend-maven-plugin/issues/204
@echo off
%~dp0node/node node/npm/bin/npm-cli.js %*
%~dp0node/npm %*
@echo on
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.bonitasoft.web</groupId>
......@@ -14,7 +15,7 @@
<maven.compiler.target>1.7</maven.compiler.target>
<!-- Properties encoding used by the npm plugin -->
<nodeVersion>v4.2.0</nodeVersion>
<npmVersion>2.14.7</npmVersion>
<npmVersion>3.5.0</npmVersion>
</properties>
<modules>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment