fix: getting cypress tests to run

aws-amplify · Oct 18, 2021 · 2a40055 · 2a40055
1 parent 17e0ca0
commit 2a40055
Show file tree

Hide file tree

Showing 23 changed files with 42 additions and 944 deletions.
diff --git a/packages/studio-ui-codegen-react/lib/react-studio-template-renderer.ts b/packages/studio-ui-codegen-react/lib/react-studio-template-renderer.ts
@@ -205,7 +205,7 @@ export abstract class ReactStudioTemplateRenderer extends StudioTemplateRenderer
         ),
       ],
       factory.createTypeReferenceNode(
-        factory.createQualifiedName(factory.createIdentifier('React'), factory.createIdentifier('Element')),
+        factory.createQualifiedName(factory.createIdentifier('React'), factory.createIdentifier('ReactElement')),
         undefined,
       ),
       factory.createBlock(codeBlockContent, true),

diff --git a/packages/test-generator/index.ts b/packages/test-generator/index.ts
@@ -1,17 +1,16 @@
-import { StudioComponent, StudioTheme } from '@amzn/amplify-ui-codegen-schema';
+import { StudioComponent } from '@amzn/amplify-ui-codegen-schema';
 import { StudioTemplateRendererManager, StudioTemplateRendererFactory } from '@amzn/studio-ui-codegen';
 import {
   AmplifyRenderer,
   ReactOutputConfig,
   ReactRenderConfig,
-  ReactThemeStudioTemplateRenderer,
   ModuleKind,
   ScriptTarget,
   ScriptKind,
 } from '@amzn/studio-ui-codegen-react';
 import path from 'path';
 import log from 'loglevel';
-import { ComponentSchemas, ThemeSchemas } from './lib';
+import { ComponentSchemas } from './lib';
 
 Error.stackTraceLimit = Infinity;
 
@@ -27,17 +26,17 @@ const componentRendererFactory = new StudioTemplateRendererFactory(
   (component: StudioComponent) => new AmplifyRenderer(component, renderConfig),
 );
 
-const themeRendererFactory = new StudioTemplateRendererFactory(
-  (theme: StudioTheme) => new ReactThemeStudioTemplateRenderer(theme, renderConfig),
-);
+// const themeRendererFactory = new StudioTemplateRendererFactory(
+//   (theme: StudioTheme) => new ReactThemeStudioTemplateRenderer(theme, renderConfig),
+// );
 
 const outputPathDir = path.resolve(path.join(__dirname, '..', 'test-app-templates', 'src', 'ui-components'));
 const outputConfig: ReactOutputConfig = {
   outputPathDir,
 };
 
 const rendererManager = new StudioTemplateRendererManager(componentRendererFactory, outputConfig);
-const themeRendererManager = new StudioTemplateRendererManager(themeRendererFactory, outputConfig);
+// const themeRendererManager = new StudioTemplateRendererManager(themeRendererFactory, outputConfig);
 
 const decorateTypescriptWithMarkdown = (typescriptSource: string): string => {
   return `\`\`\`typescript jsx\n${typescriptSource}\n\`\`\``;
@@ -67,18 +66,18 @@ Object.entries(ComponentSchemas).forEach(([name, schema]) => {
     log.error(err);
   }
 });
-
-Object.entries(ThemeSchemas).forEach(([name, schema]) => {
-  log.info(`# ${name}`);
-  try {
-    themeRendererManager.renderSchemaToTemplate(schema as any);
-    const buildRenderer = themeRendererFactory.buildRenderer(schema as any);
-
-    const component = buildRenderer.renderComponent();
-    log.info('## Theme Output');
-    log.info(decorateTypescriptWithMarkdown(component.componentText));
-  } catch (err) {
-    log.error(`${name} failed with error:`);
-    log.error(err);
-  }
-});
+//
+// Object.entries(ThemeSchemas).forEach(([name, schema]) => {
+//   log.info(`# ${name}`);
+//   try {
+//     themeRendererManager.renderSchemaToTemplate(schema as any);
+//     const buildRenderer = themeRendererFactory.buildRenderer(schema as any);
+//
+//     const component = buildRenderer.renderComponent();
+//     log.info('## Theme Output');
+//     log.info(decorateTypescriptWithMarkdown(component.componentText));
+//   } catch (err) {
+//     log.error(`${name} failed with error:`);
+//     log.error(err);
+//   }
+// });
diff --git a/packages/test-generator/lib/components/boxTest.json b/packages/test-generator/lib/components/boxTest.json
@@ -10,5 +10,5 @@
     }
   },
   "overrides": {},
-  "name": "Test"
+  "name": "BoxTest"
 }
diff --git a/...t-generator/lib/components/boxGolden.json → ...nerator/lib/components/boxWithButton.json b/...t-generator/lib/components/boxGolden.json → ...nerator/lib/components/boxWithButton.json
diff --git a/...nerator/lib/components/exposedAsTest.json → ...ib/components/boxWithButtonExposedAs.json b/...nerator/lib/components/exposedAsTest.json → ...ib/components/boxWithButtonExposedAs.json
@@ -1,7 +1,7 @@
 {
   "id": "1234-5678-9010",
   "componentType": "Box",
-  "name": "BoxWithButton",
+  "name": "BoxWithButtonExposedAs",
   "properties": {},
   "children": [
     {

diff --git a/packages/test-generator/lib/components/collectionWithBinding.json b/packages/test-generator/lib/components/collectionWithBinding.json
diff --git a/packages/test-generator/lib/components/collectionWithBindingAndSort.json b/packages/test-generator/lib/components/collectionWithBindingAndSort.json
diff --git a/packages/test-generator/lib/components/collectionWithBindingWithoutPredicate.json b/packages/test-generator/lib/components/collectionWithBindingWithoutPredicate.json
diff --git a/packages/test-generator/lib/components/collectionWithoutBinding.json b/packages/test-generator/lib/components/collectionWithoutBinding.json