diff --git a/protractor.conf.js b/protractor.conf.js deleted file mode 100644 index 86ccde6..0000000 --- a/protractor.conf.js +++ /dev/null @@ -1,35 +0,0 @@ -// Protractor configuration file, see link for more information -// https://github.com/angular/protractor/blob/master/lib/config.ts - -const { SpecReporter } = require('jasmine-spec-reporter'); -const JasmineReporters = require('jasmine-reporters'); - -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() {} - }, - onPrepare() { - require('ts-node').register({ - project: 'e2e/tsconfig.e2e.json' - }); - jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } })); - jasmine.getEnv().addReporter(new JasmineReporters.JUnitXmlReporter({ - consolidateAll: false, - savePath: './reports/e2e', - filePrefix: '', - modifyReportFileName: (generatedFileName, suite) => 'test-results' - })); - } -}; diff --git a/src/app/modules/scroll-to/scroll-to.service.ts b/src/app/modules/scroll-to/scroll-to.service.ts index b3ae315..7e83e77 100644 --- a/src/app/modules/scroll-to/scroll-to.service.ts +++ b/src/app/modules/scroll-to/scroll-to.service.ts @@ -18,7 +18,7 @@ import { DEFAULTS, isNativeElement } from './statics/scroll-to-helpers'; -import { Observable, ReplaySubject, throwError } from 'rxjs'; +import { Observable, ReplaySubject, throwError } from 'rxjs/index'; /** * The ScrollToService handles starting, interrupting diff --git a/src/app/modules/scroll-to/statics/scroll-to-animation.ts b/src/app/modules/scroll-to/statics/scroll-to-animation.ts index 3457c42..eea79a3 100644 --- a/src/app/modules/scroll-to/statics/scroll-to-animation.ts +++ b/src/app/modules/scroll-to/statics/scroll-to-animation.ts @@ -1,4 +1,4 @@ -import { Observable, ReplaySubject } from 'rxjs'; +import { Observable, ReplaySubject } from 'rxjs/index'; import { EASING } from '../statics/scroll-to-helpers'; import {