revert order

Author: C-Lodder

Gruntfile.js

@@ -29,17 +29,6 @@ module.exports = (grunt) => {
         },
 
         postcss: {
-            mapAnnotationPath: {
-                options: {
-                    map: {
-                        inline: false,
-                        annotation: 'tmp/maps/'
-                    },
-                    processors: processors
-                },
-                src: 'test/fixtures/a.css',
-                dest: 'tmp/mapAnnotationPath.css'
-            },
             defaults: {
                 options: {
                     processors: processors
@@ -72,6 +61,17 @@ module.exports = (grunt) => {
                 src: 'test/fixtures/a.css',
                 dest: 'tmp/mapSeparate.css'
             },
+            mapAnnotationPath: {
+                options: {
+                    map: {
+                        inline: false,
+                        annotation: 'tmp/maps/'
+                    },
+                    processors: processors
+                },
+                src: 'test/fixtures/a.css',
+                dest: 'tmp/mapAnnotationPath.css'
+            },
             diff: {
                 options: {
                     diff: true,

tasks/postcss.js

@@ -45,6 +45,7 @@ module.exports = (grunt) => {
         }
 
         if (typeof options.map.annotation === 'string') {
+            //annotation = path.relative(path.dirname(to), getSourcemapPath(to));
             annotation = path.relative(path.dirname(to), getSourcemapPath(to)).replace(/\\/g, '/');
         }
 
@@ -63,7 +64,8 @@ module.exports = (grunt) => {
                 prev: getPrevMap(from),
                 inline: (typeof options.map.inline === 'boolean') ? options.map.inline : true,
                 annotation: getAnnotation(to),
-                sourcesContent: (typeof options.map.sourcesContent === 'boolean') ? options.map.sourcesContent : true
+                sourcesContent: (typeof options.map.sourcesContent === 'boolean') ? options.map.sourcesContent : true,
+                //absolute: (typeof options.map.absolute === 'boolean') ? options.map.absolute : false
             },
             from: from,
             to: to,

test/test.js

@@ -26,32 +26,12 @@ const fileExists = async(file) => {
         await access(file);
         return true;
     } catch (error) {
-        console.log(error);
         return false;
     }
 };
 
 exports.gruntPostcss = {
 
-    mapAnnotationPath: async(test) => {
-        const actual = {
-            css: await readFile('tmp/mapAnnotationPath.css', 'utf8'),
-            map: await readFile('tmp/maps/mapAnnotationPath.css.map', 'utf8'),
-        };
-
-        const expected = {
-            css: await readFile('test/expected/mapAnnotationPath.css', 'utf8'),
-            map: await readFile('test/expected/maps/mapAnnotationPath.css.map', 'utf8'),
-        };
-
-        test.strictEqual(actual.css, expected.css);
-        test.strictEqual(actual.map, expected.map);
-
-        const checkExists = await fileExists('tmp/mapAnnotationPath.css.map');
-        test.ok(!checkExists);
-        test.done();
-    },
-
     defaults: async(test) => {
         const actual = {
             css: await readFile('tmp/defaults.css', 'utf8'),
@@ -116,6 +96,25 @@ exports.gruntPostcss = {
         test.done();
     },
 
+    mapAnnotationPath: async(test) => {
+        const actual = {
+            css: await readFile('tmp/mapAnnotationPath.css', 'utf8'),
+            map: await readFile('tmp/maps/mapAnnotationPath.css.map', 'utf8'),
+        };
+
+        const expected = {
+            css: await readFile('test/expected/mapAnnotationPath.css', 'utf8'),
+            map: await readFile('test/expected/maps/mapAnnotationPath.css.map', 'utf8'),
+        };
+
+        test.strictEqual(actual.css, expected.css);
+        test.strictEqual(actual.map, expected.map);
+
+        const checkExists = await fileExists('tmp/mapAnnotationPath.css.map');
+        test.ok(!checkExists);
+        test.done();
+    },
+
     diff: async(test) => {
         const actual = {
             css: await readFile('tmp/diff.css', 'utf8'),