eslint-module-utils: Fix resolver tests for Windows paths

https://ci.appveyor.com/project/benmosher/eslint-plugin-import/build/2055/job/wsl6hrhpc2dt10cs
import-js · Jun 5, 2017 · 117717f · 117717f
1 parent 314ead8
commit 117717f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/tests/files/foo-bar-resolver-no-version.js b/tests/files/foo-bar-resolver-no-version.js
@@ -1,12 +1,11 @@
 var path = require('path')
 
 exports.resolveImport = function (modulePath, sourceFile, config) {
-  var fooPathSuffix = '/files/foo.js'
-  var exceptionPathSuffix = '/files/exception.js'
-  if (sourceFile.indexOf(fooPathSuffix) === sourceFile.length - fooPathSuffix.length) {
+  var sourceFileName = path.basename(sourceFile)
+  if (sourceFileName === 'foo.js') {
     return path.join(__dirname, 'bar.jsx')
   }
-  else if (sourceFile.indexOf(exceptionPathSuffix) === sourceFile.length - exceptionPathSuffix.length) {
+  else if (sourceFileName === 'exception.js') {
     throw new Error('foo-bar-resolver-v1 resolveImport test exception')
   }
   else {

diff --git a/tests/files/foo-bar-resolver-v1.js b/tests/files/foo-bar-resolver-v1.js
@@ -1,12 +1,11 @@
 var path = require('path')
 
 exports.resolveImport = function (modulePath, sourceFile, config) {
-  var fooPathSuffix = '/files/foo.js'
-  var exceptionPathSuffix = '/files/exception.js'
-  if (sourceFile.indexOf(fooPathSuffix) === sourceFile.length - fooPathSuffix.length) {
+  var sourceFileName = path.basename(sourceFile)
+  if (sourceFileName === 'foo.js') {
     return path.join(__dirname, 'bar.jsx')
   }
-  else if (sourceFile.indexOf(exceptionPathSuffix) === sourceFile.length - exceptionPathSuffix.length) {
+  else if (sourceFileName === 'exception.js') {
     throw new Error('foo-bar-resolver-v1 resolveImport test exception')
   }
   else {

diff --git a/tests/files/foo-bar-resolver-v2.js b/tests/files/foo-bar-resolver-v2.js
@@ -1,12 +1,11 @@
 var path = require('path')
 
 exports.resolve = function (modulePath, sourceFile, config) {
-  var fooPathSuffix = '/files/foo.js'
-  var exceptionPathSuffix = '/files/exception.js'
-  if (sourceFile.indexOf(fooPathSuffix) === sourceFile.length - fooPathSuffix.length) {
+  var sourceFileName = path.basename(sourceFile)
+  if (sourceFileName === 'foo.js') {
     return { found: true, path: path.join(__dirname, 'bar.jsx') }
   }
-  else if (sourceFile.indexOf(exceptionPathSuffix) === sourceFile.length - exceptionPathSuffix.length) {
+  else if (sourceFileName === 'exception.js') {
     throw new Error('foo-bar-resolver-v2 resolve test exception')
   }
   else {