Skip to content

Commit 281f731

Browse files
committed
pom úprava
1 parent 25c302c commit 281f731

5 files changed

Lines changed: 31 additions & 4 deletions

File tree

TODO

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
odstranit závislost na spring-boot
22

33
karma nebo gulp build-test
4-
protractor
5-
6-
npm-offline?
4+
protractor headless
75

java-devstack-frontend/src/main/frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"test-single-run": "karma start test/karma.conf.js --single-run",
1313
"update-webdriver": "webdriver-manager update",
1414
"protractor": "protractor test/protractor-conf.js",
15-
"protractor-ci": "protractor test/protractor-conf.ci.js"
15+
"protractor-ci": "protractor test/protractor-conf.ci.js",
16+
"protractor-phantom": "protractor test/protractor-conf.phantomjs.ci.js"
1617
},
1718
"author": "angular@angular.cz>",
1819
"devDependencies": {
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
exports.config = {
2+
allScriptsTimeout: 11000,
3+
specs: [
4+
'scenarios/**/*.js'
5+
],
6+
7+
capabilities: {
8+
9+
'browserName': 'phantomjs',
10+
11+
'phantomjs.binary.path': './node_modules/karma-phantomjs-launcher/node_modules/phantomjs/bin/phantomjs',
12+
'phantomjs.cli.args': ['--webdriver=9515' ]
13+
14+
},
15+
16+
baseUrl: 'http://localhost:8080/',
17+
framework: 'jasmine',
18+
jasmineNodeOpts: {
19+
defaultTimeoutInterval: 30000
20+
}
21+
};

java-devstack-frontend/src/main/frontend/test/scenarios/user.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,10 @@ describe('user detail', function() {
99
expect(browser.getTitle()).toEqual('Java devstack');
1010
});
1111

12+
it('should have right name', function() {
13+
var elem = element(by.css('.page div div'));
14+
expect(elem.getText()).toEqual('Hello World');
15+
});
16+
17+
1218
});

java-devstack-webapp/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
<webApp>
9696
<contextPath>/</contextPath>
9797
</webApp>
98+
<war>${project.build.directory}/${project.build.finalName}.war</war>
9899
</configuration>
99100
</plugin>
100101
</plugins>

0 commit comments

Comments
 (0)