From bb18a62a3daec88452c90252d9278d9718a103a8 Mon Sep 17 00:00:00 2001 From: lukas Date: Tue, 9 Jun 2020 23:22:43 +0200 Subject: [PATCH] some reformattings added badges --- README.md | 2 ++ package.json | 3 +++ src/elements/{ => AddTagPopup}/AddTagPopup.js | 0 src/elements/AddTagPopup/AddTagPopup.test.js | 17 ++++++++++++++++ src/{css => elements/SideBar}/SideBar.css | 0 src/elements/{ => SideBar}/SideBar.js | 2 +- src/elements/SideBar/SideBar.test.js | 20 +++++++++++++++++++ src/{css => elements/Tag}/Tag.css | 0 src/elements/{ => Tag}/Tag.js | 2 +- src/elements/{ => Tag}/Tag.test.js | 0 src/pages/CategoryPage.js | 4 ++-- src/pages/HomePage.js | 4 ++-- src/pages/Player.js | 6 +++--- src/pages/RandomPage.js | 4 ++-- 14 files changed, 53 insertions(+), 11 deletions(-) rename src/elements/{ => AddTagPopup}/AddTagPopup.js (100%) create mode 100644 src/elements/AddTagPopup/AddTagPopup.test.js rename src/{css => elements/SideBar}/SideBar.css (100%) rename src/elements/{ => SideBar}/SideBar.js (88%) create mode 100644 src/elements/SideBar/SideBar.test.js rename src/{css => elements/Tag}/Tag.css (100%) rename src/elements/{ => Tag}/Tag.js (94%) rename src/elements/{ => Tag}/Tag.test.js (100%) diff --git a/README.md b/README.md index e81edf5..1751beb 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![pipeline status](http://gitlab.heili.eu/lukas/openmediacenter/badges/master/pipeline.svg)](http://gitlab.heili.eu/lukas/openmediacenter/-/commits/master) +[![coverage report](http://gitlab.heili.eu/lukas/openmediacenter/badges/master/coverage.svg)](http://gitlab.heili.eu/lukas/openmediacenter/-/commits/master) # Open Media Center Github: This is only a clone of the main Repository. diff --git a/package.json b/package.json index bdef1e1..76d5c51 100644 --- a/package.json +++ b/package.json @@ -47,5 +47,8 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "react-test-renderer": "^16.13.1" } } diff --git a/src/elements/AddTagPopup.js b/src/elements/AddTagPopup/AddTagPopup.js similarity index 100% rename from src/elements/AddTagPopup.js rename to src/elements/AddTagPopup/AddTagPopup.js diff --git a/src/elements/AddTagPopup/AddTagPopup.test.js b/src/elements/AddTagPopup/AddTagPopup.test.js new file mode 100644 index 0000000..96df887 --- /dev/null +++ b/src/elements/AddTagPopup/AddTagPopup.test.js @@ -0,0 +1,17 @@ +import React from "react"; +import ReactDom from 'react-dom' + +import {render, cleanup} from '@testing-library/react' +import "@testing-library/jest-dom" + +import AddTagPopup from "./AddTagPopup"; + +afterEach(cleanup); + +describe('', function () { + it('renders without crashing ', function () { + const div = document.createElement("div"); + ReactDom.render(,div); + ReactDom.unmountComponentAtNode(div); + }); +}); diff --git a/src/css/SideBar.css b/src/elements/SideBar/SideBar.css similarity index 100% rename from src/css/SideBar.css rename to src/elements/SideBar/SideBar.css diff --git a/src/elements/SideBar.js b/src/elements/SideBar/SideBar.js similarity index 88% rename from src/elements/SideBar.js rename to src/elements/SideBar/SideBar.js index 173e8ef..9899adf 100644 --- a/src/elements/SideBar.js +++ b/src/elements/SideBar/SideBar.js @@ -1,5 +1,5 @@ import React from "react"; -import "../css/SideBar.css" +import "./SideBar.css" class SideBar extends React.Component { render() { diff --git a/src/elements/SideBar/SideBar.test.js b/src/elements/SideBar/SideBar.test.js new file mode 100644 index 0000000..a9b0b70 --- /dev/null +++ b/src/elements/SideBar/SideBar.test.js @@ -0,0 +1,20 @@ +import React from "react"; +import ReactDom from 'react-dom' +import SideBar from "./SideBar"; + +import {render} from '@testing-library/react' +import "@testing-library/jest-dom" + +describe('', function () { + it('renders without crashing ', function () { + const div = document.createElement("div"); + ReactDom.render(,div); + ReactDom.unmountComponentAtNode(div); + }); + + it('renders childs correctly', function () { + const {getByText} = render(test); + const randomElement = getByText(/test/i); + expect(randomElement).toBeInTheDocument(); + }); +}); diff --git a/src/css/Tag.css b/src/elements/Tag/Tag.css similarity index 100% rename from src/css/Tag.css rename to src/elements/Tag/Tag.css diff --git a/src/elements/Tag.js b/src/elements/Tag/Tag.js similarity index 94% rename from src/elements/Tag.js rename to src/elements/Tag/Tag.js index 66a1476..1f6f169 100644 --- a/src/elements/Tag.js +++ b/src/elements/Tag/Tag.js @@ -1,6 +1,6 @@ import React from "react"; -import "../css/Tag.css" +import "./Tag.css" class Tag extends React.Component { diff --git a/src/elements/Tag.test.js b/src/elements/Tag/Tag.test.js similarity index 100% rename from src/elements/Tag.test.js rename to src/elements/Tag/Tag.test.js diff --git a/src/pages/CategoryPage.js b/src/pages/CategoryPage.js index 986636b..325c398 100644 --- a/src/pages/CategoryPage.js +++ b/src/pages/CategoryPage.js @@ -1,6 +1,6 @@ import React from "react"; -import SideBar from "../elements/SideBar"; -import Tag from "../elements/Tag"; +import SideBar from "../elements/SideBar/SideBar"; +import Tag from "../elements/Tag/Tag"; import {TagPreview} from "../elements/Preview"; import NewTagPopup from "../elements/NewTagPopup"; diff --git a/src/pages/HomePage.js b/src/pages/HomePage.js index cadea97..e285de8 100644 --- a/src/pages/HomePage.js +++ b/src/pages/HomePage.js @@ -1,6 +1,6 @@ import React from "react"; -import SideBar from "../elements/SideBar"; -import Tag from "../elements/Tag"; +import SideBar from "../elements/SideBar/SideBar"; +import Tag from "../elements/Tag/Tag"; import VideoContainer from "../elements/VideoContainer"; import "../css/HomePage.css" diff --git a/src/pages/Player.js b/src/pages/Player.js index 0e9a783..a4c337f 100644 --- a/src/pages/Player.js +++ b/src/pages/Player.js @@ -1,9 +1,9 @@ import React from "react"; import "../css/Player.css" import {PlyrComponent} from 'plyr-react'; -import SideBar from "../elements/SideBar"; -import Tag from "../elements/Tag"; -import AddTagPopup from "../elements/AddTagPopup"; +import SideBar from "../elements/SideBar/SideBar"; +import Tag from "../elements/Tag/Tag"; +import AddTagPopup from "../elements/AddTagPopup/AddTagPopup"; class Player extends React.Component { diff --git a/src/pages/RandomPage.js b/src/pages/RandomPage.js index 081b6d1..397597b 100644 --- a/src/pages/RandomPage.js +++ b/src/pages/RandomPage.js @@ -1,8 +1,8 @@ import React from "react"; import Preview from "../elements/Preview"; import "../css/RandomPage.css" -import SideBar from "../elements/SideBar"; -import Tag from "../elements/Tag"; +import SideBar from "../elements/SideBar/SideBar"; +import Tag from "../elements/Tag/Tag"; class RandomPage extends React.Component { constructor(props, context) {