Merge pull request #53 from rwjblue/ensure-idempotency

Ensure running codemod against transformed files is a no-op.

Author: rwjblue

.eslintrc.js

@@ -17,4 +17,12 @@ module.exports = {
       printWidth: 100,
     }],
   },
+  overrides: [
+    {
+      files: ['__tests__/**/*.js'],
+      env: {
+        jest: true
+      }
+    },
+  ],
 };

__tests__/ember-qunit-codemod-test.js

@@ -1,18 +1,40 @@
 'use strict';
 
 const fs = require('fs');
+const path = require('path');
+
+const runInlineTest = require('jscodeshift/dist/testUtils').runInlineTest;
+const EmberQUnitTransform = require('../ember-qunit-codemod');
 
-const defineTest = require('jscodeshift/dist/testUtils').defineTest;
 const fixtureFolder = `${__dirname}/../__testfixtures__/ember-qunit-codemod`;
 
-fs
-  .readdirSync(fixtureFolder)
-  .filter(filename => /\.input\.js$/.test(filename))
-  .forEach(filename => {
-    defineTest(
-      __dirname,
-      'ember-qunit-codemod',
-      {},
-      `ember-qunit-codemod/${filename.replace(/\.input\.js$/, '')}`
-    );
-  });
+describe('ember-qunit-codemod', function() {
+  fs
+    .readdirSync(fixtureFolder)
+    .filter(filename => /\.input\.js$/.test(filename))
+    .forEach(filename => {
+      let testName = filename.replace('.input.js', '');
+      let inputPath = path.join(fixtureFolder, `${testName}.input.js`);
+      let outputPath = path.join(fixtureFolder, `${testName}.output.js`);
+
+      describe(testName, function() {
+        it('transforms correctly', function() {
+          runInlineTest(
+            EmberQUnitTransform,
+            {},
+            { source: fs.readFileSync(inputPath, 'utf8') },
+            fs.readFileSync(outputPath, 'utf8')
+          );
+        });
+
+        it('is idempotent', function() {
+          runInlineTest(
+            EmberQUnitTransform,
+            {},
+            { source: fs.readFileSync(outputPath, 'utf8') },
+            fs.readFileSync(outputPath, 'utf8')
+          );
+        });
+      });
+    });
+});

ember-qunit-codemod.js

@@ -144,14 +144,19 @@ module.exports = function(file, api, options) {
   function parseModule(p) {
     let calleeName = p.node.expression.callee.name;
     // Find the moduleName and the module's options
-    let moduleName, subject, options, hasCustomSubject;
+    let moduleName, subject, options, hasCustomSubject, isNestedModule;
     let calleeArguments = p.node.expression.arguments.slice();
     let lastArgument = calleeArguments[calleeArguments.length - 1];
     if (lastArgument.type === 'ObjectExpression') {
       options = calleeArguments.pop();
     }
-    moduleName = calleeArguments[1] || calleeArguments[0];
-    subject = calleeArguments[0];
+    if (calleeArguments[1] && j.match(calleeArguments[1], { type: 'FunctionExpression' })) {
+      isNestedModule = true;
+      moduleName = calleeArguments[0];
+    } else {
+      moduleName = calleeArguments[1] || calleeArguments[0];
+      subject = calleeArguments[0];
+    }
 
     let setupIdentifier = calleeName === 'module' ? null : 'setupTest';
     if (options) {
@@ -171,7 +176,7 @@ module.exports = function(file, api, options) {
       hasCustomSubject = options.properties.some(p => p.key.name === 'subject');
     }
 
-    return [moduleName, options, setupIdentifier, subject, hasCustomSubject];
+    return [moduleName, options, setupIdentifier, subject, hasCustomSubject, isNestedModule];
   }
 
   function updateModuleForToNestedModule() {
@@ -198,7 +203,13 @@ module.exports = function(file, api, options) {
     }
 
     function createModule(p) {
-      let [moduleName, options, setupType, subject, hasCustomSubject] = parseModule(p);
+      let [moduleName, options, setupType, subject, hasCustomSubject, isNestedModule] = parseModule(
+        p
+      );
+
+      if (isNestedModule) {
+        return null;
+      }
 
       let needsHooks = false;
       let moduleSetupExpression;
@@ -447,6 +458,9 @@ module.exports = function(file, api, options) {
       let expression = expressionPath.node;
       if (isModuleDefinition(expressionPath)) {
         let result = createModule(expressionPath);
+        if (result === null) {
+          return;
+        }
         expressionPath.replace(result[0]);
         currentModuleCallbackBody = result[1];
         currentTestType = result[2];