test: add tests for overrideOutputDir and fix assertions (#675)

Author: Dane Pilcher

packages/amplify-codegen/tests/commands/__snapshots__/models.test.js.snap

@@ -0,0 +1,63 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`command-models-generates models in expected output path android: Should generate models from a single schema file 1`] = `
+Array [
+  "AmplifyModelProvider.java",
+  "SimpleModel.java",
+]
+`;
+
+exports[`command-models-generates models in expected output path android: Should generate models from any subdirectory in schema folder 1`] = `
+Array [
+  "AmplifyModelProvider.java",
+  "SimpleModel.java",
+]
+`;
+
+exports[`command-models-generates models in expected output path flutter: Should generate models from a single schema file 1`] = `
+Array [
+  "ModelProvider.dart",
+  "SimpleModel.dart",
+]
+`;
+
+exports[`command-models-generates models in expected output path flutter: Should generate models from any subdirectory in schema folder 1`] = `
+Array [
+  "ModelProvider.dart",
+  "SimpleModel.dart",
+]
+`;
+
+exports[`command-models-generates models in expected output path ios: Should generate models from a single schema file 1`] = `
+Array [
+  "AmplifyModels.swift",
+  "SimpleModel+Schema.swift",
+  "SimpleModel.swift",
+]
+`;
+
+exports[`command-models-generates models in expected output path ios: Should generate models from any subdirectory in schema folder 1`] = `
+Array [
+  "AmplifyModels.swift",
+  "SimpleModel+Schema.swift",
+  "SimpleModel.swift",
+]
+`;
+
+exports[`command-models-generates models in expected output path javascript: Should generate models from a single schema file 1`] = `
+Array [
+  "index.d.ts",
+  "index.js",
+  "schema.d.ts",
+  "schema.js",
+]
+`;
+
+exports[`command-models-generates models in expected output path javascript: Should generate models from any subdirectory in schema folder 1`] = `
+Array [
+  "index.d.ts",
+  "index.js",
+  "schema.d.ts",
+  "schema.js",
+]
+`;

packages/amplify-codegen/tests/commands/models.test.js

@@ -35,8 +35,8 @@ const MOCK_CONTEXT = {
   },
 };
 const OUTPUT_PATHS = {
-  javascript: 'src',
-  android: 'app/src/main/java',
+  javascript: 'src/models',
+  android: 'app/src/main/java/com/amplifyframework/datastore/generated/model',
   ios: 'amplify/generated/models',
   flutter: 'lib/models',
 };
@@ -60,7 +60,7 @@ describe('command-models-generates models in expected output path', () => {
       const outputDirectory = path.join(MOCK_PROJECT_ROOT, OUTPUT_PATHS[frontend]);
       const mockedFiles = {};
       mockedFiles[schemaFilePath] = {
-        'schema.graphql': ' type SimpleModel { id: ID! status: String } ',
+        'schema.graphql': ' type SimpleModel @model { id: ID! status: String } ',
       };
       mockedFiles[outputDirectory] = {};
       mockFs(mockedFiles);
@@ -75,7 +75,7 @@ describe('command-models-generates models in expected output path', () => {
       expect(graphqlCodegen.codegen).toBeCalled();
 
       // assert model files are generated in expected output directory
-      expect(fs.readdirSync(outputDirectory).length).toBeGreaterThan(0);
+      expect(fs.readdirSync(outputDirectory)).toMatchSnapshot();
     });
 
     it(frontend + ': Should generate models from any subdirectory in schema folder', async () => {
@@ -99,7 +99,35 @@ describe('command-models-generates models in expected output path', () => {
       expect(graphqlCodegen.codegen).toBeCalled();
 
       // assert model files are generated in expected output directory
-      expect(fs.readdirSync(outputDirectory).length).toBeGreaterThan(0);
+      expect(fs.readdirSync(outputDirectory)).toMatchSnapshot();
+    });
+
+    it(frontend + ': Should generate models in overrideOutputDir', async () => {
+      // mock the input and output file structure
+      const schemaFilePath = path.join(MOCK_BACKEND_DIRECTORY, 'api', MOCK_PROJECT_NAME);
+      const outputDirectory = path.join(MOCK_PROJECT_ROOT, OUTPUT_PATHS[frontend]);
+      const mockedFiles = {};
+      mockedFiles[schemaFilePath] = {
+        'schema.graphql': ' type SimpleModel @model { id: ID! status: String } ',
+      };
+      const overrideOutputDir = 'some/other/dir';
+      mockedFiles[outputDirectory] = {};
+      mockedFiles[overrideOutputDir] = {};
+      mockFs(mockedFiles);
+      MOCK_CONTEXT.amplify.getProjectConfig.mockReturnValue({ frontend: frontend });
+
+      // assert empty folder before generation
+      expect(fs.readdirSync(outputDirectory).length).toEqual(0);
+      expect(fs.readdirSync(overrideOutputDir).length).toEqual(0);
+
+      await generateModels(MOCK_CONTEXT, { overrideOutputDir });
+
+      // assert model generation succeeds with a single schema file
+      expect(graphqlCodegen.codegen).toBeCalled();
+
+      // assert model files are generated in expected output directory
+      expect(fs.readdirSync(outputDirectory).length).toEqual(0);
+      expect(fs.readdirSync(overrideOutputDir).length).not.toEqual(0);
     });
 
     if (frontend === 'flutter') {