Skip to content

HT-24 Added login command to get the gui tests running #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lenton99 merged 4 commits into from
Feb 9, 2022
Merged

HT-24 Added login command to get the gui tests running #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
479db3a
HT-24 Added login command to get the gui tests running
Lenton99 Feb 9, 2022
3db1e41
Merge branch 'develop' of https://github.com/jarrodback/CSSD-Assignme…
Lenton99 Feb 9, 2022
8ab7deb
HT-24 Fixed server tests error
Lenton99 Feb 9, 2022
f38c775
HT-24 Fixed indentation and implented logout auth test
Lenton99 Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/.nyc_output/processinfo/index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"processes":{"6c705a37-9f9a-432f-af14-21ee8ee708bc":{"parent":null,"children":[]}},"files":{"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\app.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\database\\index.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\config\\db.config.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\journey.model.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\bill.model.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\utilities.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\location.model.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\user.model.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\auth.routes.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\user.business.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\datalayer\\mongo.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\bill.routes.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\bill.business.js":["6c705a37-9f9a-432f-af14-21ee8ee708bc"]},"externalIds":{}}
{"processes":{"50560bfc-9d99-4dfb-92f6-1329d287dafe":{"parent":null,"children":[]}},"files":{"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\app.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\database\\index.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\config\\db.config.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\journey.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\bill.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\utilities.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\location.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\models\\user.model.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\auth.routes.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\auth.controller.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\user.business.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\datalayer\\mongo.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\routes\\bill.routes.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\middleware\\auth\\authJwt.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\controllers\\bill.controller.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"],"E:\\UniWork\\CSSD\\CSSD-Assignment\\server\\business\\bill.business.js":["50560bfc-9d99-4dfb-92f6-1329d287dafe"]},"externalIds":{}}
74 changes: 37 additions & 37 deletions server/coverage/lcov.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ FN:34,(anonymous_4)
FN:42,(anonymous_5)
FN:47,(anonymous_6)
FNF:7
FNH:2
FNH:1
FNDA:1,(anonymous_0)
FNDA:0,(anonymous_1)
FNDA:0,(anonymous_2)
FNDA:1,(anonymous_3)
FNDA:0,(anonymous_3)
FNDA:0,(anonymous_4)
FNDA:0,(anonymous_5)
FNDA:0,(anonymous_6)
Expand All @@ -88,13 +88,13 @@ DA:9,1
DA:16,0
DA:22,0
DA:25,0
DA:32,1
DA:32,0
DA:35,0
DA:43,0
DA:46,0
DA:47,0
LF:14
LH:7
LH:6
BRDA:19,0,0,0
BRDA:19,0,1,0
BRDA:20,1,0,0
Expand Down Expand Up @@ -196,14 +196,14 @@ FN:34,(anonymous_4)
FN:39,(anonymous_5)
FN:47,(anonymous_6)
FNF:7
FNH:2
FNH:3
FNDA:1,(anonymous_0)
FNDA:1,(anonymous_1)
FNDA:0,(anonymous_2)
FNDA:0,(anonymous_3)
FNDA:0,(anonymous_4)
FNDA:0,(anonymous_5)
FNDA:0,(anonymous_6)
FNDA:1,(anonymous_6)
DA:1,1
DA:2,1
DA:7,1
Expand All @@ -219,10 +219,10 @@ DA:32,0
DA:35,0
DA:40,0
DA:47,1
DA:48,0
DA:49,0
DA:48,1
DA:49,1
LF:17
LH:11
LH:13
BRF:0
BRH:0
end_of_record
Expand All @@ -238,12 +238,12 @@ FN:27,(anonymous_6)
FN:29,(anonymous_7)
FN:30,(anonymous_8)
FNF:9
FNH:2
FNH:0
FNDA:0,(anonymous_0)
FNDA:0,(anonymous_1)
FNDA:0,(anonymous_2)
FNDA:1,(anonymous_3)
FNDA:1,(anonymous_4)
FNDA:0,(anonymous_3)
FNDA:0,(anonymous_4)
FNDA:0,(anonymous_5)
FNDA:0,(anonymous_6)
FNDA:0,(anonymous_7)
Expand All @@ -255,15 +255,15 @@ DA:8,0
DA:9,0
DA:11,0
DA:18,1
DA:19,1
DA:20,1
DA:19,0
DA:20,0
DA:21,0
DA:27,1
DA:28,0
DA:29,0
DA:30,0
LF:14
LH:7
LH:5
BRF:0
BRH:0
end_of_record
Expand Down Expand Up @@ -324,12 +324,12 @@ FN:41,(anonymous_6)
FN:48,(anonymous_7)
FN:51,(anonymous_8)
FNF:9
FNH:3
FNH:2
FNDA:2,(anonymous_0)
FNDA:0,(anonymous_1)
FNDA:0,(anonymous_2)
FNDA:0,(anonymous_3)
FNDA:1,(anonymous_4)
FNDA:0,(anonymous_4)
FNDA:1,(anonymous_5)
FNDA:0,(anonymous_6)
FNDA:0,(anonymous_7)
Expand All @@ -338,14 +338,14 @@ DA:4,2
DA:11,0
DA:16,0
DA:17,0
DA:26,1
DA:26,0
DA:35,1
DA:42,0
DA:49,0
DA:51,0
DA:56,1
LF:10
LH:4
LH:3
BRF:0
BRH:0
end_of_record
Expand All @@ -354,33 +354,33 @@ SF:middleware\auth\authJwt.js
FN:4,(anonymous_0)
FN:12,(anonymous_1)
FNF:2
FNH:2
FNDA:1,(anonymous_0)
FNDA:1,(anonymous_1)
FNH:0
FNDA:0,(anonymous_0)
FNDA:0,(anonymous_1)
DA:1,1
DA:4,1
DA:5,1
DA:5,0
DA:6,0
DA:10,1
DA:12,1
DA:13,1
DA:10,0
DA:12,0
DA:13,0
DA:14,0
DA:18,1
DA:19,1
DA:20,1
DA:21,1
DA:22,1
DA:18,0
DA:19,0
DA:20,0
DA:21,0
DA:22,0
DA:37,1
LF:14
LH:12
LH:3
BRDA:5,0,0,0
BRDA:5,0,1,1
BRDA:5,1,0,1
BRDA:5,1,1,1
BRDA:5,0,1,0
BRDA:5,1,0,0
BRDA:5,1,1,0
BRDA:13,2,0,0
BRDA:13,2,1,1
BRDA:13,2,1,0
BRF:6
BRH:4
BRH:0
end_of_record
TN:
SF:models\bill.model.js
Expand Down
14 changes: 14 additions & 0 deletions server/database/seed.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ const journeys = [
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.038Z"
},
{
_id: "123456789109",
regNumber: "test_reg_number",
entryLocation: "123456789101",
exitLocation: "123456789102",
journeyDateTime: "2022-02-01T15:50:51.039Z"
}
]

const bills = [
Expand All @@ -86,6 +93,13 @@ const bills = [
driver: "123456789108",
cost: 5,
paid: true
},
{
_id: "123456789110",
journey: "123456789109",
driver: "123456789107",
cost: 5,
paid: false
}
]

Expand Down
17 changes: 17 additions & 0 deletions server/test/integration/auth.controller.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,21 @@ describe("Testing /auth paths", () => {
done();
});
});

it("user should able to logout", (done) => {
// Arrange
const request = {
};

// Act
chai.request(server)
.post("/auth/logout")
.send(request)
.end((err, res) => {
// Assert
res.should.have.status(200);

done();
});
});
});
14 changes: 7 additions & 7 deletions server/test/integration/bill.controller.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe("Testing /bill paths", () => {
// Assert
res.should.have.status(200);
res.should.be.a("object");
res.body.bills.should.have.lengthOf(2);
res.body.bills.should.have.lengthOf(3);
res.body.bills[0].should.haveOwnProperty(
"cost",
72.93887106726764
Expand Down Expand Up @@ -87,7 +87,7 @@ describe("Testing /bill paths", () => {
"latitude",
0
);
res.body.count.should.equal(2);
res.body.count.should.equal(3);

done();
});
Expand Down Expand Up @@ -176,7 +176,7 @@ describe("Testing /bill paths", () => {

res.should.have.status(200);
res.should.be.a("object");
res.body.bills.should.have.lengthOf(1);
res.body.bills.should.have.lengthOf(2);
res.body.bills[0].should.haveOwnProperty(
"cost",
72.93887106726764
Expand Down Expand Up @@ -226,7 +226,7 @@ describe("Testing /bill paths", () => {
"latitude",
0
);
res.body.count.should.equal(2);
res.body.count.should.equal(3);

done();
});
Expand Down Expand Up @@ -297,7 +297,7 @@ describe("Testing /bill paths", () => {
"latitude",
0
);
res.body.count.should.equal(2);
res.body.count.should.equal(3);

done();
});
Expand Down Expand Up @@ -367,7 +367,7 @@ describe("Testing /bill paths", () => {
"latitude",
0
);
res.body.count.should.equal(2);
res.body.count.should.equal(3);

done();
});
Expand All @@ -389,7 +389,7 @@ describe("Testing /bill paths", () => {
res.should.have.status(200);
res.should.be.a("object");
res.body.bills.should.have.lengthOf(0);
res.body.count.should.equal(2);
res.body.count.should.equal(3);

done();
});
Expand Down
9 changes: 8 additions & 1 deletion ui/cypress/support/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,11 @@
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
Cypress.Commands.add('login', (email, password) => {
cy.visit('/')
cy.get('#email').type(email)
cy.get('#password').type(password)
cy.get('#login').click()
cy.url().should('contain', '/my-bills')
})
2 changes: 1 addition & 1 deletion ui/src/views/Login.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Input id="password" v-model="loginData.password" placeholder="Password..." rules="required" type="password" label="Password" class="mt-3"/>
</ValidationObserver>
<span class="mt-4">New here? <b-link class="link">Sign up!</b-link></span>
<b-button variant="primary" class="mt-3" @click="login">Sign in</b-button>
<b-button id="login" variant="primary" class="mt-3" @click="login">Sign in</b-button>
</b-input-group>
</template>
</b-card>
Expand Down
25 changes: 0 additions & 25 deletions ui/tests/e2e/support/commands.js
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions ui/tests/e2e/support/index.js
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions ui/tests/e2e/tests/mybills.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
describe('My Bills Tests', () => {

before(() => {
cy.login('test@email.com', 'test1')
})

it('displays two rows in the bills table', () => {
//Act
cy.visit('/my-bills')
Expand Down
Loading