mend
This commit is contained in:
parent
08a8649a25
commit
a6ff3c2813
|
|
@ -17,6 +17,10 @@ install:
|
||||||
- (cd web && npm install --no-progress && npm run build:prod)
|
- (cd web && npm install --no-progress && npm run build:prod)
|
||||||
&& mvn clean install -q -f lib/ -DskipTests=true -Dmaven.javadoc.skip=true -B
|
&& mvn clean install -q -f lib/ -DskipTests=true -Dmaven.javadoc.skip=true -B
|
||||||
&& mvn clean install -q -f rest/ -DskipTests=true -Dmaven.javadoc.skip=true -B
|
&& mvn clean install -q -f rest/ -DskipTests=true -Dmaven.javadoc.skip=true -B
|
||||||
|
before_script:
|
||||||
|
- "export DISPLAY=:99.0"
|
||||||
|
- "sh -e /etc/init.d/xvfb start"
|
||||||
|
- sleep 3 # give xvfb some time to start
|
||||||
script:
|
script:
|
||||||
- (cd web && npm run test)
|
- (cd web && npm run test)
|
||||||
&& mvn verify -f lib/
|
&& mvn verify -f lib/
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ module.exports = function (config) {
|
||||||
logLevel: config.LOG_INFO,
|
logLevel: config.LOG_INFO,
|
||||||
autoWatch: true,
|
autoWatch: true,
|
||||||
browsers: ['Firefox', 'PhantomJS'],
|
browsers: ['Firefox', 'PhantomJS'],
|
||||||
singleRun: false
|
singleRun: false,
|
||||||
|
browserNoActivityTimeout: 30000
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue