cleaned up testing branch (feature/checkbox), removed console logs

Co-authored-by: Philip Hua <[email protected]>
Co-authored-by: Miles Wright <[email protected]>
Co-authored-by: William Rittwage  <[email protected]>
Co-authored-by: Daniel Reilley <[email protected]>

Author: pmhua

app/electron/main.js

@@ -204,7 +204,6 @@ app.on('ready', createWindow);
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
-  require('electron').app.getPath('userData');
   win.webContents.executeJavaScript('window.localStorage.clear();');
   app.quit();
 });

app/src/components/right/ExportButton.tsx

@@ -87,7 +87,6 @@ export default function ExportButton() {
     // when a directory is chosen, the callback will export the project to the chosen folder
     // Note: this listener is imported from the main process via preload.js
     window.api.addAppDirChosenListener(path => {
-      // console.log(testchecked);
       exportProject(
         path,
         state.name

app/src/helperFunctions/generateCode.ts

@@ -188,7 +188,7 @@ const generateUnformattedCode = (
           .join('\n')
       : imports
           .map((comp: string) => {
-            return `import ${comp} from './${comp}.tsx'`;
+            return `import ${comp} from './${comp}'`;
           })
           .join('\n');
 

app/src/utils/createApplication.util.ts

@@ -376,8 +376,7 @@ async function createApplicationUtil({
   await createTsLint(path, appName);
   await createServer(path, appName);
   if (testchecked) {
-    console.log('entering createTestSuiteClassic');
-  await createTestSuiteClassic({path, appName, components, testchecked});
+    await createTestSuiteClassic({path, appName, components, testchecked});
   }
   await createFiles(components, path, appName, true);
 }

app/src/utils/createGatsbyApp.util.ts

@@ -26,7 +26,6 @@ const compToCSS = (component: Component) => {
 
 //createPackage
 export const createPackage = (path, appName, test) => {
-  // console.log('in createpackage: ',test);
   const filePath = `${path}/${appName}/package.json`;
 
   let tsjest = `,
@@ -36,7 +35,6 @@ export const createPackage = (path, appName, test) => {
           "enzyme": "^3.11.0",
           "enzyme-adapter-react-16": "^1.15.6",
           "jest": "^27.2.0",
-          "react-test-renderer": "^17.0.2",
           "@types/react-dom": "^17.0.9",
           "@types/enzyme-adapter-react-16": "^1.0.6",
           "@types/react-test-renderer": "^17.0.1",
@@ -191,7 +189,6 @@ async function createGatsbyAppUtil({
   await createPackage(path, appName, testchecked);
   await createTsConfig(path, appName);
   if (testchecked) {
-    console.log('testchecked: ',testchecked);
     await createTestSuite({path, appName, components, rootComponents, testchecked});
   }
   await createGatsbyFiles(components, path, appName, rootComponents);

app/src/utils/createNextApp.util.ts

@@ -212,7 +212,6 @@ async function createNextAppUtil({
   await createPackage(path, appName, testchecked);
   await createTsConfig(path, appName);
   if (testchecked) {
-    console.log('testchecked: ',testchecked);
     await createTestSuiteNext({path, appName, components, rootComponents, testchecked});
   }
   await createNextFiles(components, path, appName, rootComponents);

app/src/utils/createTestSuite.util.ts

@@ -2,9 +2,6 @@
 // create config files
 // add webpack dependencies
 // create tests for components
-// const createTestSuite = () => {
-//   console.log('creating test suites');
-// }
 
 const initFolders = (path: string, appName: string) => {
   let dir = path;
@@ -120,12 +117,9 @@ async function createJestPreprocessFile(path: string, appName: string){
 
 async function createComponentTests(path: string, appName: string, components: Component[]) {
   const filePath: string = `${path}/${appName}/__tests__/test.tsx`;
-  console.log(JSON.stringify(components))
-  console.log(components);
 
   let data:string = `
   import React from "react"
-  import renderer from "react-test-renderer"
   import Enzyme, { shallow } from 'enzyme';
 
 
@@ -135,9 +129,17 @@ async function createComponentTests(path: string, appName: string, components: C
 
   components.forEach(page => {
 
-    let importString = `
+    let importString = ''
+    if (page.isPage) {
+
+      importString = `
   import ${capitalize(page.name)} from "../src/pages/${page.name}";`;
-    data = data + importString;
+      data = data + importString;
+    } else {
+      importString = `
+  import ${capitalize(page.name)} from "../src/components/${page.name}";`;
+      data = data + importString;   
+    }
   })
 
   //let describe = `describe("${page.name}", () => {`
@@ -149,10 +151,8 @@ async function createComponentTests(path: string, appName: string, components: C
 
   data = data + `
     it("renders correctly", () => {
-      const tree = renderer
-          .create(<${capitalize(page.name)} />)
-          .toJSON()
-      expect(tree).toMatchSnapshot()
+      const tree = shallow(<${capitalize(page.name)} />);
+      expect(tree).toMatchSnapshot();
     })`
 
 
@@ -189,9 +189,6 @@ async function createTestSuite({
   rootComponents: number[];
   testchecked: boolean;
 }) {
-  console.log('in the createGatsbyApplication util');
-  console.log('testchecked: ', testchecked);
-
   await initFolders(path, appName);
   await createMocksFiles(path, appName);
   await createTestsFiles(path, appName);

app/src/utils/createTestSuiteClassic.util.ts

@@ -2,7 +2,6 @@
 
 
 const initFolders = (path: string, appName: string) => {
-  console.log(window); // remember to delete
   let dir = path;
   dir = `${dir}/${appName}`;
   if (!window.api.existsSync(`${dir}/__tests__`)) {
@@ -53,8 +52,6 @@ const createJestPreprocessFile = (path: string, appName: string) => {
 
 async function createComponentTests(path: string, appName: string, components: Component[]) {
     const filePath: string = `${path}/${appName}/__tests__/test.tsx`;
-    console.log(JSON.stringify(components))
-    console.log(components);
 
     let data:string = `
     import { shallow } from 'enzyme'
@@ -146,9 +143,6 @@ async function createTestSuiteClassic({
   components: Component[];
   testchecked: boolean;
 }) {
-  console.log('in the createClassicApplication util');
-  console.log('testchecked: ', testchecked);
-
   await initFolders(path, appName);
   await createJestConfigFile(path, appName);
   await createJestPreprocessFile(path, appName);

app/src/utils/createTestSuiteNext.util.ts

@@ -59,7 +59,6 @@ module.exports = {
 };
 
 async function createJestTsconfigJsonFile(path: String, appName: String){
-  console.log('got in create jest tsconfig');
   const filePath:string = `${path}/${appName}/jest.tsconfig.json`;
   const data:string = `
 {
@@ -88,7 +87,6 @@ async function createJestTsconfigJsonFile(path: String, appName: String){
   ]
 }
 `;
-  console.log(data);
   window.api.writeFile(filePath, data, err => {
     if (err) {
       console.log('createTestSuiteNext.util createJestTsconfigJsonFile error:', err.message);
@@ -133,16 +131,13 @@ require('enzyme').configure({adapter: new Adapter()});`;
 
 async function createComponentTests(path: string, appName: string, components: Component[]) {
   const filePath: string = `${path}/${appName}/__tests__/test.tsx`;
-  console.log(JSON.stringify(components))
-  console.log(components);
 
   let data:string = `
   import { shallow } from 'enzyme'
   import React from 'react';
   `;
 
   components.forEach(page => {
-    console.log(page);
     let importString = '';
     if (page.isPage) {
       importString = `
@@ -202,12 +197,7 @@ async function createTestSuite({
   rootComponents: number[];
   testchecked: boolean;
 }) {
-  console.log('in the createGatsbyApplication util');
-  console.log('testchecked: ', testchecked);
-
   await initFolders(path, appName);
-  // await createMocksFiles(path, appName);
-  // await createTestsFiles(path, appName);
   await createJestConfigFile(path, appName);
   await createJestTsconfigJsonFile(path, appName);
   await createJestPreprocessFile(path, appName);

server/graphQL/resolvers/query.js

@@ -7,7 +7,6 @@ const { Projects, Comments } = require('../../models/reactypeModels');
 const Project = {
   getProject: async (parent, { projId }) => {
     const resp = await Projects.findOne({ _id: projId });
-    // console.log('getProject return >>> ', resp);
     if (resp) {
       return ({
         name: resp.name,
@@ -29,7 +28,6 @@ const Project = {
 
   getAllProjects: async (parent, { userId }) => {
     let resp = await Projects.find({});
-    // console.log('getAllProjects resp >>> ', resp);
     if (userId) {
       // use loosely equal for the callback because there are some discrepancy between the type of userId from the db vs from the mutation query
       resp = resp.filter(proj => proj.userId == userId);

server/server.js

@@ -55,7 +55,6 @@ app.get(
     if (isDev) {
       return res.status(200).redirect(`http://localhost:8080?=${res.locals.ssid}`);
     } else {
-      console.log('res.locals.ssid: ',res.locals.ssid);
       return res.status(200).redirect(`app://rse?=${res.locals.ssid}`);
     }
   }