Skip to content

Commit

Permalink
Cleanup repo from shippable and phantomjs (#921)
Browse files Browse the repository at this point in the history
  • Loading branch information
dxvladislavvolkov committed Dec 25, 2018
1 parent 3102a13 commit 469cbf0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 11 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ examples/app/**/*.map
examples/app/**/*.js
src/ui/
src/index.ts
shippable/
9 changes: 3 additions & 6 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ gulp.task('generate.metadata', ['build.tools', 'clean.metadata'], function () {

gulp.task('clean.generatedComponents', function () {
var outputFolderPath = buildConfig.tools.componentGenerator.outputFolderPath;

return del([outputFolderPath + "/**/*.*"]);
});

Expand Down Expand Up @@ -123,7 +123,7 @@ gulp.task('build.ngc', function(done) {
var config = buildConfig.components,
buildPath = path.join(config.outputPath, 'tsconfig.json'),
task = shell.task(['ngc -p ' + buildPath ]);

task(done);
});

Expand Down Expand Up @@ -243,7 +243,7 @@ gulp.task('watch.spec', function() {
var getKarmaConfig = function(testsPath) {
const preprocessors = {};
preprocessors[testsPath] = [ 'webpack' ];
return karmaConfig.parseConfig(path.resolve('./karma.conf.js'), {
return karmaConfig.parseConfig(path.resolve('./karma.conf.js'), {
files: [{ pattern: testsPath, watched: false }],
preprocessors: preprocessors
});
Expand Down Expand Up @@ -300,9 +300,6 @@ gulp.task('test.tools', function(done) {
verbosity: 1,
color: true,
showStack: true
}),
new jasmineReporters.JUnitXmlReporter({
savePath: 'shippable/testresults/tools'
})
]
}));
Expand Down
2 changes: 0 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ module.exports = function(config) {
],

junitReporter: {
outputDir: 'shippable/testresults/',
outputFile: 'test-results.xml'
},

// Karma plugins loaded
plugins: [
require('karma-jasmine'),
require('karma-chrome-launcher'),
require('karma-phantomjs-launcher'),
require('karma-junit-reporter'),
require('karma-webpack')
],
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"karma-chrome-launcher": "^2.0.0",
"karma-jasmine": "^1.0.2",
"karma-junit-reporter": "^1.1.0",
"karma-phantomjs-launcher": "^1.0.2",
"karma-webpack": "^2.0.9",
"lite-server": "^2.2.0",
"mkdirp": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/src/ui/range-selector.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class TestContainerComponent {
value = {startValue: 0, endValue: 10};
count = 0;
@ViewChild('rangeSelector') rangeSelector: DxRangeSelectorComponent;
onChanged(e) {
onChanged() {
this.count++;
}
}
Expand Down

0 comments on commit 469cbf0

Please sign in to comment.