This repository has been archived by the owner on Nov 9, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Modified app code for changes in Clarity v0.10.x - Modified code for changes to Jasmine - modified configurations for changes to multiple deps `ng start`, `ng test`, and `ng e2e` all run as expected. Signed-off-by: Matt Hippely <mhippely@vmware.com>
- Loading branch information
1 parent
8a117b3
commit f9644ac
Showing
6 changed files
with
1,783 additions
and
1,403 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,8 @@ | |
| "node_modules/@types" | ||
| ], | ||
| "types": [ | ||
| "jasmine" | ||
| "jasmine", | ||
| "jasminewd2" | ||
| ] | ||
| }, | ||
| "exclude": [ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,28 @@ | ||
| // Protractor configuration file, see link for more information | ||
| // https://github.com/angular/protractor/blob/master/docs/referenceConf.js | ||
| // https://github.com/angular/protractor/blob/master/lib/config.ts | ||
|
|
||
| /*global jasmine */ | ||
| var SpecReporter = require('jasmine-spec-reporter'); | ||
| const { SpecReporter } = require('jasmine-spec-reporter'); | ||
|
|
||
| exports.config = { | ||
| allScriptsTimeout: 11000, | ||
| specs: [ | ||
| './e2e/**/*.e2e-spec.ts' | ||
| ], | ||
| capabilities: { | ||
| 'browserName': 'chrome' | ||
| }, | ||
| directConnect: true, | ||
| baseUrl: 'http://localhost:4200/', | ||
| framework: 'jasmine', | ||
| jasmineNodeOpts: { | ||
| showColors: true, | ||
| defaultTimeoutInterval: 30000, | ||
| print: function() {} | ||
| }, | ||
| useAllAngular2AppRoots: true, | ||
| beforeLaunch: function() { | ||
| require('ts-node').register({ | ||
| project: 'e2e' | ||
| }); | ||
| }, | ||
| onPrepare: function() { | ||
| jasmine.getEnv().addReporter(new SpecReporter()); | ||
| } | ||
| allScriptsTimeout: 11000, | ||
| specs: [ | ||
| './e2e/**/*.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: 'e2e/tsconfig.json' | ||
| }); | ||
| jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); | ||
| } | ||
| }; |
Oops, something went wrong.