Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
todo-client-tests
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mathias Willoch Picker
todo-client-tests
Commits
3d69f61e
Commit
3d69f61e
authored
4 years ago
by
Mathias Picker
Browse files
Options
Downloads
Patches
Plain Diff
fixed server tests
parent
fafcfeb4
No related branches found
No related tags found
No related merge requests found
Pipeline
#87978
failed
4 years ago
Stage: build
Stage: test
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-0
3 additions, 0 deletions
.gitlab-ci.yml
server/src/task-router.js
+1
-1
1 addition, 1 deletion
server/src/task-router.js
server/test/task-router.test.js
+29
-7
29 additions, 7 deletions
server/test/task-router.test.js
with
33 additions
and
8 deletions
.gitlab-ci.yml
+
3
−
0
View file @
3d69f61e
...
...
@@ -33,6 +33,9 @@ test:
# Create database table
-
echo "CREATE TABLE Tasks (id INT NOT NULL AUTO_INCREMENT, title TEXT NOT NULL, done BOOL
DEFAULT
false
, PRIMARY KEY(id));" | mysql $MYSQL_DATABASE
test_server
:
script
:
-
cd server
-
npm install
-
npm test
...
...
This diff is collapsed.
Click to expand it.
server/src/task-router.js
+
1
−
1
View file @
3d69f61e
...
...
@@ -47,7 +47,7 @@ router.post('/tasks/update/:id', (request, response) => {
if
(
dataIsValid
)
{
taskService
.
update
(
updateTaskObject
)
.
then
((
task
)
=>
(
task
?
response
.
send
(
task
)
:
response
.
status
(
404
).
send
(
'
Task not found
'
)))
.
then
((
task
)
=>
(
task
.
affectedRows
?
response
.
send
(
task
)
:
response
.
status
(
404
).
send
(
'
Task not found
'
)))
.
catch
((
error
:
Error
)
=>
response
.
status
(
500
).
send
(
error
));
}
else
{
response
.
status
(
400
).
send
(
'
Missing task title
'
)
...
...
This diff is collapsed.
Click to expand it.
server/test/task-router.test.js
+
29
−
7
View file @
3d69f61e
...
...
@@ -6,9 +6,9 @@ import app from '../src/app';
import
taskService
,
{
type
Task
}
from
'
../src/task-service
'
;
const
testTasks
:
Task
[]
=
[
{
id
:
1
,
title
:
'
Les leksjon
'
,
done
:
false
},
{
id
:
2
,
title
:
'
Møt opp på forelesning
'
,
done
:
false
},
{
id
:
3
,
title
:
'
Gjør øving
'
,
done
:
false
},
{
id
:
1
,
title
:
'
Les leksjon
'
,
description
:
'
Coolio
'
,
done
:
false
},
{
id
:
2
,
title
:
'
Møt opp på forelesning
'
,
description
:
'
Okei da
'
,
done
:
false
},
{
id
:
3
,
title
:
'
Gjør øving
'
,
description
:
'
Will do
'
,
done
:
false
},
];
// Since API is not compatible with v1, API version is increased to v2
...
...
@@ -27,9 +27,9 @@ beforeEach((done) => {
// Create testTasks sequentially in order to set correct id, and call done() when finished
taskService
.
create
(
testTasks
[
0
].
title
)
.
then
(()
=>
taskService
.
create
(
testTasks
[
1
].
title
))
// Create testTask[1] after testTask[0] has been created
.
then
(()
=>
taskService
.
create
(
testTasks
[
2
].
title
))
// Create testTask[2] after testTask[1] has been created
.
create
(
{
title
:
testTasks
[
0
].
title
,
description
:
testTasks
[
0
].
description
}
)
.
then
(()
=>
taskService
.
create
(
{
title
:
testTasks
[
1
].
title
,
description
:
testTasks
[
1
].
description
}
))
// Create testTask[1] after testTask[0] has been created
.
then
(()
=>
taskService
.
create
(
{
title
:
testTasks
[
2
].
title
,
description
:
testTasks
[
2
].
description
}
))
// Create testTask[2] after testTask[1] has been created
.
then
(()
=>
done
());
// Call done() after testTask[2] has been created
// Note that the above expression can be written as:
...
...
@@ -93,7 +93,7 @@ describe('Fetch tasks (GET)', () => {
describe
(
'
Create new task (POST)
'
,
()
=>
{
test
(
'
Create new task (200 OK)
'
,
(
done
)
=>
{
axios
.
post
<
{},
number
>
(
'
/tasks
'
,
{
title
:
'
Ny oppgave
'
})
.
post
<
{},
number
>
(
'
/tasks
'
,
{
title
:
'
Ny oppgave
'
,
description
:
"
Ny beskrivelse
"
})
.
then
((
response
)
=>
{
expect
(
response
.
status
).
toEqual
(
200
);
expect
(
response
.
data
).
toEqual
({
id
:
4
});
...
...
@@ -102,6 +102,28 @@ describe('Create new task (POST)', () => {
});
});
describe
(
'
Update tasks (PUT)
'
,
()
=>
{
test
(
'
Update existing tasks title (200 OK)
'
,
(
done
)
=>
{
axios
.
post
<
{}
>
(
'
/tasks/update/1
'
,
{
title
:
'
Ny oppgave
'
})
.
then
((
response
)
=>
{
expect
(
response
.
status
).
toEqual
(
200
);
expect
(
response
.
data
.
affectedRows
).
toEqual
(
1
);
expect
(
response
.
data
.
changedRows
).
toEqual
(
1
);
done
();
});
});
test
(
'
Update task that does not exist (404 NOT FOUND)
'
,
(
done
)
=>
{
axios
.
post
<
{}
>
(
'
/tasks/update/10
'
,
{
title
:
'
Ny oppgave
'
})
.
catch
((
error
:
Error
)
=>
{
expect
(
error
.
message
).
toEqual
(
'
Request failed with status code 404
'
);
done
();
});
});
});
describe
(
'
Delete task (DELETE)
'
,
()
=>
{
test
(
'
Delete task (200 OK)
'
,
(
done
)
=>
{
axios
.
delete
(
'
/tasks/2
'
).
then
((
response
)
=>
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment