Update existing tests

src/components/appList.tsx

@@ -4,8 +4,8 @@ import { IAppProps } from "./app";
 import { Headline, ListContainer } from "./elements";
 
 export interface IAppListProps {
-  categories: Array<IAppCategoryProps>;
+  categories?: Array<IAppCategoryProps>;
-  apps: Array<IAppProps>;
+  apps?: Array<IAppProps>;
 }
 
 /**
@@ -13,17 +13,26 @@ export interface IAppListProps {
  * @param {IAppListProps} props props of the given list of apps
  * @returns {React.ReactNode} the app list component
  */
-const AppList = ({ categories, apps }: IAppListProps) => (
+const AppList = ({ categories, apps }: IAppListProps) => {
-  <ListContainer>
+  if (apps || categories) {
-    <Headline>Applications</Headline>
+    return (
-    {categories &&
+      <ListContainer>
-      categories.map(({ name, items }, idx) => (
+        <Headline>Applications</Headline>
-        <AppCategory key={[name, idx].join("")} name={name} items={items} />
+        {categories &&
-      ))}
+          categories.map(({ name, items }, idx) => (
-    {apps && (
+            <AppCategory key={[name, idx].join("")} name={name} items={items} />
-      <AppCategory name={categories ? "Uncategorized apps" : ""} items={apps} />
+          ))}
-    )}
+        {apps && (
-  </ListContainer>
+          <AppCategory
-);
+            name={categories ? "Uncategorized apps" : ""}
+            items={apps}
+          />
+        )}
+      </ListContainer>
+    );
+  } else {
+    return <></>;
+  }
+};
 
 export default AppList;

src/components/imprint.tsx

@@ -1,4 +1,3 @@
-import React from "react";
 import Modal from "./modal";
 import styled from "styled-components";
 import selectedTheme from "../lib/theme";
@@ -63,6 +62,12 @@ export const ImprintField = ({ field }: IImprintFieldComponentProps) => (
   <Link href={field.link}>{field.text}</Link>
 );
 
+export const onClose = () => {
+  if (window.location.href.endsWith("#imprint")) {
+    window.location.href = window.location.href.replace("#imprint", "");
+  }
+};
+
 /**
  * Renders the imprint component
  * @param {IImprintProps} props contents of the imprint
@@ -80,14 +85,7 @@ const Imprint = ({ imprint }: IImprintComponentProps) => (
             text="View Imprint"
             title="Legal Disclosure"
             condition={!window.location.href.endsWith("#imprint")}
-            onClose={() => {
+            onClose={onClose}
-              if (window.location.href.endsWith("#imprint")) {
-                window.location.href = window.location.href.replace(
-                  "#imprint",
-                  "",
-                );
-              }
-            }}
           >
             <div>
               <ModalSubHeadline>

src/test/components/__snapshots__/appList.spec.tsx.snap

@@ -1,3 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AppList snapshot test 1`] = `[Function]`;
+exports[`appList.tsx Tests AppList rendering with apps 1`] = `[Function]`;
+
+exports[`appList.tsx Tests AppList rendering with categories 1`] = `[Function]`;
+
+exports[`appList.tsx Tests AppList rendering with categories and apps 1`] = `[Function]`;
+
+exports[`appList.tsx Tests AppList rendering with neither 1`] = `[Function]`;

src/test/components/appList.spec.tsx

@@ -34,10 +34,27 @@ const props: IAppListProps = {
   ],
 };
 
-it("AppList snapshot test", () => {
+describe("appList.tsx", () => {
-  const { asFragment } = render(
+  it("Tests AppList rendering with categories and apps", () => {
-    <AppList categories={props.categories} apps={props.apps} />,
+    const { asFragment } = render(
-  );
+      <AppList categories={props.categories} apps={props.apps} />,
+    );
 
-  expect(asFragment).toMatchSnapshot();
+    expect(asFragment).toMatchSnapshot();
+  });
+
+  it("Tests AppList rendering with categories", () => {
+    const { asFragment } = render(<AppList categories={props.categories} />);
+    expect(asFragment).toMatchSnapshot();
+  });
+
+  it("Tests AppList rendering with apps", () => {
+    const { asFragment } = render(<AppList apps={props.apps} />);
+    expect(asFragment).toMatchSnapshot();
+  });
+
+  it("Tests AppList rendering with neither", () => {
+    const { asFragment } = render(<AppList />);
+    expect(asFragment).toMatchSnapshot();
+  });
 });

src/test/components/greeter.spec.tsx

@@ -64,11 +64,11 @@ it("isBetween test", () => {
 });
 
 it("getExtension test", () => {
+  expect(getExtension(0)).toEqual("");
   expect(getExtension(1)).toEqual("st");
   expect(getExtension(2)).toEqual("nd");
   expect(getExtension(3)).toEqual("rd");
-  expect(getExtension(4)).toEqual("th");
+  expect(getExtension(15)).toEqual("th");
-  expect(getExtension(55)).toEqual("th");
 });
 
 it("Greeter snapshot test", () => {

src/test/components/imprint.spec.tsx

@@ -1,5 +1,9 @@
 import { fireEvent, render } from "@testing-library/react";
-import Imprint, { IImprintProps, ImprintField } from "../../components/imprint";
+import Imprint, {
+  IImprintProps,
+  ImprintField,
+  onClose,
+} from "../../components/imprint";
 
 const props: IImprintProps = {
   name: {
@@ -43,15 +47,16 @@ describe("imprint.tsx", () => {
     expect(asFragment).toMatchSnapshot();
   });
 
-  it("Tests #imprint", () => {
+  it("Tests onClose with #imprint", () => {
     const location = window.location.href;
     window.location.href = location + "#imprint";
+    onClose();
+    expect(window.location.href).toEqual(location);
+  });
 
-    const imprintModal = render(<Imprint imprint={props} />);
+  it("Tests onClose without #imprint", () => {
-
+    const location = window.location.href;
-    fireEvent.click(imprintModal.getByTestId("toggle-button"));
+    onClose();
-    //fireEvent.click(imprintModal.getByTestId("close-button"));
-
     expect(window.location.href).toEqual(location);
   });