refactor: simplify test changes

Author: zacharygolba

src/index.js

@@ -30,16 +30,6 @@ const exists = uri => {
   }
 };
 
-const getVolume = id => {
-  let volume = '';
-
-  if (IS_WINDOWS && typeof id === 'string') {
-    [volume] = id.match(VOLUME) || [''];
-  }
-
-  return volume;
-};
-
 const normalizeId = id => {
   if (IS_WINDOWS && typeof id === 'string') {
     return slash(id.replace(VOLUME, ''));
@@ -63,7 +53,6 @@ export default function alias(options = {}) {
 
   return {
     resolveId(importee, importer) {
-      const volume = getVolume(importee) || getVolume(importer);
       const importeeId = normalizeId(importee);
       const importerId = normalizeId(importer);
 
@@ -87,19 +76,19 @@ export default function alias(options = {}) {
                             .find(exists);
 
         if (match) {
-          return path.join(volume, match);
+          return match;
         }
 
         // To keep the previous behaviour we simply return the file path
         // with extension
         if (endsWith('.js', filePath)) {
-          return path.join(volume, filePath);
+          return filePath;
         }
 
-        return path.join(volume, filePath + '.js');
+        return filePath + '.js';
       }
 
-      return path.join(volume, updatedId);
+      return updatedId;
     },
   };
 }

test/index.js

@@ -1,9 +1,11 @@
 import test from 'ava';
-import path from 'path';
+import { posix as path } from 'path';
 import { rollup } from 'rollup';
 import alias from '../dist/rollup-plugin-alias';
 import slash from 'slash';
 
+const DIRNAME = slash(__dirname.replace(/^([A-Z]:)/, ''));
+
 test(t => {
   t.is(typeof alias, 'function');
 });
@@ -91,12 +93,9 @@ test('Test for the resolve property', t => {
     resolve: ['.js', '.jsx'],
   });
 
-  const resolved = result.resolveId(
-    'ember',
-    slash(path.resolve(__dirname, './files/index.js'))
-  );
+  const resolved = result.resolveId('ember', path.resolve(DIRNAME, './files/index.js'));
 
-  t.is(resolved, slash(path.resolve(__dirname, './files/folder/hipster.jsx')));
+  t.is(resolved, path.resolve(DIRNAME, './files/folder/hipster.jsx'));
 });
 
 test(t => {
@@ -114,15 +113,9 @@ test(t => {
     resolve: './i/am/a/local/file',
   });
 
-  const resolved = result.resolveId(
-    'resolve',
-    slash(path.resolve(__dirname, './files/index.js'))
-  );
+  const resolved = result.resolveId('resolve', path.resolve(DIRNAME, './files/index.js'));
 
-  t.is(
-    resolved,
-    slash(path.resolve(__dirname, './files/i/am/a/local/file.js'))
-  );
+  t.is(resolved, path.resolve(DIRNAME, './files/i/am/a/local/file.js'));
 });
 
 // Tests in Rollup