Skip to content

Commit

Permalink
Updated to Angular 6
Browse files Browse the repository at this point in the history
  • Loading branch information
parraman committed Oct 17, 2018
1 parent 2c0d1b7 commit 8e91d8f
Show file tree
Hide file tree
Showing 13 changed files with 1,154 additions and 0 deletions.
28 changes: 28 additions & 0 deletions e2e/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts

const { SpecReporter } = require('jasmine-spec-reporter');

exports.config = {
allScriptsTimeout: 11000,
specs: [
'./src/**/*.e2e-spec.ts'
],
capabilities: {
'browserName': 'chrome'
},
directConnect: true,
baseUrl: 'http://localhost:4200/',
framework: 'jasmine',
jasmineNodeOpts: {
showColors: true,
defaultTimeoutInterval: 30000,
print: function() {}
},
onPrepare() {
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json')
});
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
}
};
14 changes: 14 additions & 0 deletions e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { AppPage } from './app.po';

describe('workspace-project App', () => {
let page: AppPage;

beforeEach(() => {
page = new AppPage();
});

it('should display welcome message', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to asm-simulator!');
});
});
11 changes: 11 additions & 0 deletions e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { browser, by, element } from 'protractor';

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

getParagraphText() {
return element(by.css('app-root h1')).getText();
}
}
4 changes: 4 additions & 0 deletions src/app/angular-split/angular-split.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Public classes.
export { AngularSplitModule } from './modules/angularSplit.module';
export { SplitComponent } from './components/split.component';
export { SplitAreaDirective } from './components/splitArea.directive';

0 comments on commit 8e91d8f

Please sign in to comment.