Skip to content

Commit

Permalink
Merge pull request #78 from sineverba/release-0.9.0
Browse files Browse the repository at this point in the history
Release 0.9.0
  • Loading branch information
sineverba authored Jan 17, 2023
2 parents d60596f + 020a6c7 commit 4d206e3
Show file tree
Hide file tree
Showing 23 changed files with 386 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:

test:
docker:
- image: cimg/node:18.13.0
- image: cimg/node:18.12.1

steps:
- checkout
Expand Down
3 changes: 3 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"trailingComma": "none"
}
2 changes: 1 addition & 1 deletion .semaphore/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ global_job_config:
commands:
- checkout
- cp .env.bak .env
- npm install -g npm@9.2.0
- npm install -g npm@9.3.0
- npm ci

blocks:
Expand Down
2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ global_job_config:
prologue:
commands:
- checkout
- npm install -g npm@9.2.0
- npm install -g npm@9.3.0

blocks:

Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# 0.8.0
# 0.9.0
+ Upgrade dependencies
+ Move login to GenericForm
+ Add payment form
+ Add payment page
+ Refactor generic page
+ Refactor payment name

## 0.8.0
+ Remove token middleware on logout
+ Remove `usersSlice`
+ Add Footer to HomePage
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include .env

IMAGE_NAME=registry.gitlab.com/cicdprojects/online-banking-frontend
CONTAINER_NAME=online-banking-frontend
APP_VERSION=0.8.0-dev
APP_VERSION=0.9.0-dev
SONARSCANNER_VERSION=4.8.0
BUILDX_VERSION=0.10.0
BINFMT_VERSION=qemu-v7.0.0-28
Expand Down
5 changes: 0 additions & 5 deletions TODO.md

This file was deleted.

2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use NGINX
FROM nginx:1.23.3-alpine
FROM nginx:1.23.3-alpine-slim
# Update and upgrade
RUN apk update --no-cache && apk upgrade
# Copy from builder
Expand Down
74 changes: 36 additions & 38 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "online-banking-frontend",
"version": "0.8.0",
"version": "0.9.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.2.1",
Expand Down Expand Up @@ -45,11 +45,11 @@
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"coveralls": "^3.1.1",
"eslint": "^8.31.0",
"eslint": "^8.32.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsx-a11y": "^6.7.0",
"eslint-plugin-import": "^2.27.4",
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-n": "^15.6.1",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-react": "^7.32.0",
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sonar.projectKey=online-banking-frontend
sonar.projectVersion=0.8.0
sonar.projectVersion=0.9.0
sonar.organization=sineverba
sonar.sources=src
sonar.exclusions=**/node_modules/**,src/scss/**,src/setupTests.js,src/__tests__/**,src/assets/**
Expand Down
12 changes: 11 additions & 1 deletion src/Router.jsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import React from "react";
import { Routes, Route } from "react-router-dom";
import {
ENTITY_PAYMENT,
ENTITY_TRANSACTIONS,
PATH_DASHBOARD,
PATH_HOME,
PATH_PAYMENTS,
PATH_TRANSACTIONS,
TYPE_GUEST,
TYPE_PRIVATE
} from "./utils/constants/constant";
import { LoginPage } from "./views/LoginPage/LoginPage";
import { DashboardPage } from "./views/DashboardPage/DashboardPage";
import { AuthRouter } from "./components/AuthRouter";
import { GenericPage } from "./views/GenericPage/GenericPage";
import {LoginPage} from "./views/LoginPage/LoginPage";

export function Router() {
return (
Expand Down Expand Up @@ -40,6 +42,14 @@ export function Router() {
</AuthRouter>
)}
/>
<Route
path={PATH_PAYMENTS}
element={(
<AuthRouter type={TYPE_PRIVATE}>
<GenericPage entity={ENTITY_PAYMENT} />
</AuthRouter>
)}
/>
</Routes>
);
}
Expand Down
46 changes: 46 additions & 0 deletions src/__tests__/App.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,50 @@ describe("Test App.js", () => {
fireEvent.click(logout);
});
});


it("Can manage missing data from mutation", async () => {

const zeroItems = {
content: []
};

server.use(
rest.post(
`${process.env.REACT_APP_BACKEND_URL}/auth/login`,
(req, res, ctx) => {
return res(ctx.json(zeroItems));
}
)
);

renderWithProviders(
<BrowserRouter>
<App />
</BrowserRouter>
);

const inputUsername = screen.getByLabelText(/username/i);
fireEvent.change(inputUsername, {
target: {
value: mockedEmail
}
});

const inputPassword = screen.getByLabelText(/password/i);
fireEvent.change(inputPassword, {
target: {
value: mockedPassword
}
});

const loginButton = screen.getByRole("button", { name: /login/i });
fireEvent.click(loginButton);

await waitFor(() => {
const loginButton = screen.getByRole("button", { name: /login/i });
expect(loginButton).toBeInTheDocument();
});
});

});
10 changes: 10 additions & 0 deletions src/__tests__/__mocks__/responses/payment.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* The answer to /bank-account-transaction POST call
*/

export const item = {
id: 64,
amount: -75,
purpose: "Energy bill",
transactionDate: "2023-01-17T11:00:25.499812937",
};
6 changes: 3 additions & 3 deletions src/__tests__/views/LoginPage/LoginPage.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { fireEvent, screen, waitFor } from "@testing-library/react";
import { LoginPage } from "../../../views/LoginPage/LoginPage";
import { GenericForm } from "../../../views/GenericPage/GenericForm";
import { renderWithProviders } from "../../__test-utils__/test-utils";
import { rest } from "msw";
// eslint-disable-next-line jest/no-mocks-import
Expand Down Expand Up @@ -29,7 +29,7 @@ afterAll(() => server.close());

describe("Test LoginPage", () => {
it("Can perform login", async () => {
renderWithProviders(<LoginPage />);
renderWithProviders(<GenericForm />);

const inputUsername = screen.getByLabelText(/username/i);
fireEvent.change(inputUsername, {
Expand All @@ -50,7 +50,7 @@ describe("Test LoginPage", () => {
});

it("Can manage wrong credentials", async () => {
renderWithProviders(<LoginPage />);
renderWithProviders(<GenericForm />);

const inputUsername = screen.getByLabelText(/username/i);
fireEvent.change(inputUsername, {
Expand Down
Loading

0 comments on commit 4d206e3

Please sign in to comment.