Skip to content

Commit 32b3651

Browse files
authored
Merge pull request #170 from OmicsDI/dev
Release v2.0
2 parents cd4271f + d13f0cb commit 32b3651

File tree

698 files changed

+33091
-21854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

698 files changed

+33091
-21854
lines changed

.gitignore

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist
5+
/tmp
6+
/out-tsc
7+
8+
# dependencies
9+
/node_modules
10+
/bower_components
11+
12+
# IDEs and editors
13+
/.idea
14+
.project
15+
.classpath
16+
.c9/
17+
*.launch
18+
.settings/
19+
*.sublime-workspace
20+
21+
# IDE - VSCode
22+
.vscode/*
23+
!.vscode/settings.json
24+
!.vscode/tasks.json
25+
!.vscode/launch.json
26+
!.vscode/extensions.json
27+
28+
# misc
29+
/.sass-cache
30+
/connect.lock
31+
/coverage
32+
/libpeerconnection.log
33+
npm-debug.log
34+
testem.log
35+
/typings
36+
37+
# e2e
38+
/e2e/*.js
39+
/e2e/*.map
40+
41+
# System Files
42+
.DS_Store
43+
Thumbs.db
44+
45+
coverage

.travis.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
language: node_js
2+
node_js:
3+
- "8"
4+
dist: trusty
5+
sudo: required
6+
7+
cache:
8+
directories:
9+
- node_modules
10+
11+
branches:
12+
only:
13+
- master
14+
- dev
15+
16+
addons:
17+
chrome: stable
18+
19+
script:
20+
- ng lint
21+
- ng test --watch false -cc
22+
- npm run e2e

e2e/app.e2e-spec.ts

+10-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,16 @@ describe('web App', function() {
77
page = new WebPage();
88
});
99

10-
it('should display message saying app works', () => {
10+
it('should show OmicsDI: Home title', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('app works!');
12+
setTimeout(() => {
13+
// Changes here will not propagate into your view.
14+
this.ngZone.run(() => {
15+
page.getTitle()
16+
.then((title: string) => {
17+
expect(title).toEqual('OmicsDI: Home');
18+
});
19+
});
20+
}, 30000);
1321
});
1422
});

e2e/app.po.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
import { browser, element, by } from 'protractor';
1+
import {browser} from 'protractor';
2+
23

34
export class WebPage {
45
navigateTo() {
56
return browser.get('/');
67
}
78

8-
getParagraphText() {
9-
return element(by.css('app-root h1')).getText();
9+
getTitle() {
10+
return browser.getTitle();
1011
}
1112
}

karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ module.exports = function (config) {
3838
colors: true,
3939
logLevel: config.LOG_INFO,
4040
autoWatch: true,
41-
browsers: ['Chrome'],
41+
browsers: ['ChromeHeadless'],
4242
singleRun: false
4343
});
4444
};

0 commit comments

Comments
 (0)