Skip to content

Commit

Permalink
Merge pull request #170 from OmicsDI/dev
Browse files Browse the repository at this point in the history
Release v2.0
  • Loading branch information
glmanhtu committed Jul 27, 2018
2 parents cd4271f + d13f0cb commit 32b3651
Show file tree
Hide file tree
Showing 698 changed files with 33,091 additions and 21,854 deletions.
45 changes: 45 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc

# dependencies
/node_modules
/bower_components

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
testem.log
/typings

# e2e
/e2e/*.js
/e2e/*.map

# System Files
.DS_Store
Thumbs.db

coverage
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
language: node_js
node_js:
- "8"
dist: trusty
sudo: required

cache:
directories:
- node_modules

branches:
only:
- master
- dev

addons:
chrome: stable

script:
- ng lint
- ng test --watch false -cc
- npm run e2e
12 changes: 10 additions & 2 deletions e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,16 @@ describe('web App', function() {
page = new WebPage();
});

it('should display message saying app works', () => {
it('should show OmicsDI: Home title', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('app works!');
setTimeout(() => {
// Changes here will not propagate into your view.
this.ngZone.run(() => {
page.getTitle()
.then((title: string) => {
expect(title).toEqual('OmicsDI: Home');
});
});
}, 30000);
});
});
7 changes: 4 additions & 3 deletions e2e/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { browser, element, by } from 'protractor';
import {browser} from 'protractor';


export class WebPage {
navigateTo() {
return browser.get('/');
}

getParagraphText() {
return element(by.css('app-root h1')).getText();
getTitle() {
return browser.getTitle();
}
}
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = function (config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
browsers: ['Chrome'],
browsers: ['ChromeHeadless'],
singleRun: false
});
};
Loading

0 comments on commit 32b3651

Please sign in to comment.