Skip to content

Commit

Permalink
Merge branch 'main' into TASK-allAppointmentsQueryFormat
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilippeWS authored Jun 1, 2022
2 parents a164131 + 30cf1d4 commit 9a80630
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
os: [ubuntu-latest] # macos-latest, windows-latest
node-version: [16.x]
#See supported Node.js release schedule at https://nodejs.org/en/about/releases/
#

steps:
- uses: actions/checkout@v2
Expand All @@ -28,6 +29,6 @@ jobs:
- run: npm test
- uses: akhileshns/[email protected]
with:
heroku_api_key: ${{ec86b22f-c068-4d5c-b1ba-feda0410744e}}
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: "dog-grooming-api"
heroku_email: "[email protected]"
1 change: 0 additions & 1 deletion DB-Modules/Tests/dogServicesInMemorytest.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ describe("Get clients for ids", () => {
expect(foundDog.breed).toBe(addedDog.breed);
expect(foundDog.clientName).toBe(allClients[0].fullName);
});

//Create Record------------------------------------------------------|
test("Adding dog -- Successful path", async () => {
const dummyDog = {
Expand Down
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: npm start
42 changes: 39 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
# BE-scheduling

## Accessible FrontEnd Link:
https://dog-groomings.herokuapp.com/

UI Protoyping Schema:
## Accessible BackEnd Link:
https://dog-grooming-api.herokuapp.com/

## Quick Start Instructions
1. Clone Github Repository to Local Machine.
2. Run `npm install` to install all necessary packages.
3. Create .env file in the root folder.
4. Add the following variables:
`MONGODB_URI:` Description: The URL to the cloud hosted DB
`PASSWORD_SALT:` Salt used in encrypting passwords
`TOKEN_SECRET:` Used to verifty user JWT
`PORT:` Port to utilize should the connection to the cloud hosted DB fail
5. Run `npm run dev` to launch.

## CI/CD Steps:
npm ci
npm run build --if-present
npm test

## Include CI/CD details
heroku_api_key: ${{secrets.HEROKU_API_KEY}}
heroku_app_name: "dog-grooming-api"
heroku_email: {"[email protected]"}
## Automated Acceptance Testing
### `npx cypress open`

Launches the test runner for Cypress API.\
See the section about [running tests](https://docs.cypress.io/guides/core-concepts/writing-and-organizing-tests#Hooks) for more information.

## UI Protoyping Schema:
https://www.figma.com/file/YFBYd05CtpXAUl1H2whxEb/Rush%3A-Web-app-prototyping-kit-(Community)?node-id=102%3A408

Product Spec Documentation:
## Product Spec Documentation:
https://docs.google.com/document/d/1-tYBP6pn_fnwizhPB3ZhvTtMLqb8_aKRsvDxsaNPS-c/edit?usp=sharing

# Testing Coverage Reports
### In Memory Tests
![In-Memory-Code-Covage](https://user-images.githubusercontent.com/91435899/170849346-31e03fe4-dae9-43dd-89f2-1bb9bec9787b.png)
### Mock Tests
![mock-tests-coverage](https://user-images.githubusercontent.com/74291980/170851364-90bb1ff9-4377-46ff-a7be-b0584ef5a5ff.PNG)

![mock-code-coverage](https://user-images.githubusercontent.com/74291980/162647492-b4ae9cc9-0118-4f10-8c76-60d5583747f1.PNG)
2 changes: 1 addition & 1 deletion backend.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const server = express();
const port = 5000;
server.use(cors());
server.use(express.json());

//GH actions test
//Get requests-------------------------------------------------------------------------------------------------------
server.get("/", (req, res) => {
res.redirect("/appointments");
Expand Down

0 comments on commit 9a80630

Please sign in to comment.