Skip to content

Commit ece1ddb

Browse files
committed
add check to ignore to and toEnd methods added by shelljs
1 parent 1917b28 commit ece1ddb

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@ cache:
1111
env:
1212
global:
1313
- SAUCE_USERNAME=stringjs
14-
- SAUCE_ACCESS_KEY=04afebd2-6375-4c09-ada4-c218609ab3da
14+
- SAUCE_ACCESS_KEY=04afebd2-6375-4c09-ada4-c218609ab3da
15+
16+
script:
17+
- npm test
18+
- gulp browserTest

dist/string.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -797,10 +797,10 @@ string.js - Copyright (C) 2012-2014, JP Richardson <[email protected]>
797797

798798
for (var i = 0; i < names.length; ++i) {
799799
var name = names[i];
800+
if (name === 'to' || name === 'toEnd') continue; // get rid of the shelljs prototype messup
800801
var func = __nsp[name];
801802
try {
802-
// #127: pass extra parameter to keep shelljs happy
803-
var type = typeof func.apply('test', ['string']);
803+
var type = typeof func.apply('teststring');
804804
retObj[name] = type;
805805
} catch (e) {}
806806
}

gulpfile.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,24 @@ gulp.task('browserify', function() {
2020
.pipe(gulp.dest(DEST));
2121
});
2222

23-
gulp.task('browser-test', function (done) {
23+
gulp.task('browserTest', function (done) {
2424
return mochify( { wd: true } )
2525
.on('error', function(err){ if(err) done(err); else done(); })
2626
.bundle();
2727
});
2828

29-
gulp.task('unit-test', ['browserify'], function () {
29+
gulp.task('test', ['browserify'], function () {
3030
return gulp.src(TEST_SRC, {read: false})
3131
.pipe(mocha({reporter: 'spec', growl: 1}));
3232
});
3333

34-
gulp.task('test', ['unit-test', 'browser-test']);
3534

3635
gulp.task('clean', function() {
3736
return gulp.src(DEST)
3837
.pipe(rimraf());
3938
});
4039

41-
gulp.task('build', ['unit-test', 'clean'], function() {
40+
gulp.task('build', ['test', 'clean'], function() {
4241
gulp.src(DEST + '/' + SRC_COMPILED)
4342
.pipe(uglify())
4443
.pipe(rename(MIN_FILE))

lib/string.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -720,10 +720,10 @@ string.js - Copyright (C) 2012-2014, JP Richardson <[email protected]>
720720

721721
for (var i = 0; i < names.length; ++i) {
722722
var name = names[i];
723+
if (name === 'to' || name === 'toEnd') continue; // get rid of the shelljs prototype messup
723724
var func = __nsp[name];
724725
try {
725-
// #127: pass extra parameter to keep shelljs happy
726-
var type = typeof func.apply('test', ['string']);
726+
var type = typeof func.apply('teststring');
727727
retObj[name] = type;
728728
} catch (e) {}
729729
}

0 commit comments

Comments
 (0)