Browse Source

reverted fs.move change

ci/travis-osximage
JP Richardson 10 years ago
parent
commit
f9cb10dff4
  1. 9
      lib/move.js
  2. 2
      test/move.test.js

9
lib/move.js

@ -14,15 +14,6 @@ function mv(source, dest, options, callback){
options = {}
}
source = path.normalize(source)
dest = path.normalize(dest)
var diff = path.relative(source, dest)
if (diff !== '' && diff.indexOf('..')) {
var err = new Error("Can't move source into dest if dest is in source.")
return callback(err)
}
var shouldMkdirp = !!options.mkdirp
var clobber = options.clobber !== false
var limit = options.limit || 16

2
test/move.test.js

@ -149,7 +149,7 @@ describe("move", function() {
})
})
describe('> when trying to a move a folder into itself', function() {
describe.skip('> when trying to a move a folder into itself', function() {
it('should produce an error', function(done) {
var SRC_DIR = path.join(TEST_DIR, 'test')
var DEST_DIR = path.join(TEST_DIR, 'test', 'test')

Loading…
Cancel
Save