pulled from luke testing branch

Author: Linhatran

__tests__/enzyme.test.tsx

@@ -58,18 +58,28 @@ describe('Test the BottomTabs component', () => {
   });
 });
 
-describe('Test All 10 default HTML elements have rendered', () => {
+describe('Test HTMLPanel Component', () => {
   const target = shallow(
     <DndProvider backend={HTML5Backend}>
       <StateContext.Provider value={initialState}>
         <HTMLPanel />
       </StateContext.Provider>
     </DndProvider>
   );
-    // comment out snapshot test because we modified UI intentionally
+
+  const props = {
+    name: 'abc',
+    key:'html-abc',
+    id:1,
+    Icon:'icon',
+    handleDelete: jest.fn()
+  };
+
   it('Matches snapshot', () => {
     expect(target).toMatchSnapshot();
   });
+  it('Should render HTMLItem', () => {
+    expect(target.find(<HTMLItem {...props} />)).toBeDefined();
 });
 
 // testing for AppContainer
@@ -131,3 +141,12 @@ describe('Test NavBar component', () => {
   });
 });
 
+describe('Test LeftContainer container', () => {
+  const target = shallow(<LeftContainer />);
+
+  it('Should render HTMLPanel', () => {
+    expect(target.find(<HTMLPanel />)).toBeDefined();
+  });
+});
+
+

app/src/helperFunctions/generateCode.ts

@@ -283,6 +283,10 @@ const formatCode = (code: string) => {
   // } else {
   //   return window.api.formatCode(code);
   // }
+<<<<<<< HEAD
+=======
+
+>>>>>>> 63636136af04d0e7331ea9149f07a11672488847
    return code;
 
 };