From 669f489ee4982fd141ef43ea0b8c7538cbe221c1 Mon Sep 17 00:00:00 2001 From: Tyler Smalley Date: Fri, 19 Oct 2018 10:57:21 -0700 Subject: [PATCH] Updates file unit tests to be Windows compatible Signed-off-by: Tyler Smalley --- src/dev/__tests__/file.js | 8 ++++---- src/dev/npm/__tests__/installed_packages.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dev/__tests__/file.js b/src/dev/__tests__/file.js index 7884c78c8edf2..36fe23a81bab9 100644 --- a/src/dev/__tests__/file.js +++ b/src/dev/__tests__/file.js @@ -17,7 +17,7 @@ * under the License. */ -import { resolve } from 'path'; +import { resolve, sep } from 'path'; import expect from 'expect.js'; @@ -38,7 +38,7 @@ describe('dev/File', () => { describe('#getRelativePath()', () => { it('returns the path relative to the repo root', () => { const file = new File(HERE); - expect(file.getRelativePath()).to.eql('src/dev/__tests__/file.js'); + expect(file.getRelativePath()).to.eql(['src', 'dev', '__tests__', 'file.js'].join(sep)); }); }); @@ -69,8 +69,8 @@ describe('dev/File', () => { it('returns the parents of a file, stopping at the repo root, in descending order', () => { const file = new File(HERE); expect(file.getRelativeParentDirs()).to.eql([ - 'src/dev/__tests__', - 'src/dev', + ['src', 'dev', '__tests__'].join(sep), // src/dev/__tests__ + ['src', 'dev'].join(sep), // src/dev 'src', ]); }); diff --git a/src/dev/npm/__tests__/installed_packages.js b/src/dev/npm/__tests__/installed_packages.js index f845f6630cf7c..dd465b5b82145 100644 --- a/src/dev/npm/__tests__/installed_packages.js +++ b/src/dev/npm/__tests__/installed_packages.js @@ -17,7 +17,7 @@ * under the License. */ -import { resolve } from 'path'; +import { resolve, sep } from 'path'; import { uniq } from 'lodash'; import expect from 'expect.js'; @@ -61,7 +61,7 @@ describe('src/dev/npm/installed_packages', () => { licenses: [ 'Apache-2.0' ], repository: 'https://github.com/mycorp/dep1', directory: resolve(FIXTURE1_ROOT, 'node_modules/dep1'), - relative: 'node_modules/dep1', + relative: ['node_modules', 'dep1'].join(sep), }, { name: 'privatedep', @@ -69,7 +69,7 @@ describe('src/dev/npm/installed_packages', () => { repository: 'https://github.com/mycorp/privatedep', licenses: [ 'Apache-2.0' ], directory: resolve(FIXTURE1_ROOT, 'node_modules/privatedep'), - relative: 'node_modules/privatedep' + relative: ['node_modules', 'privatedep'].join(sep) } ]); });