Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 73402f1

Browse files
submissionDirs is now lockedFiles and use git bundle in tests
1 parent e670db4 commit 73402f1

File tree

5 files changed

+33
-31
lines changed

5 files changed

+33
-31
lines changed

‎src/rabbitmq/jobqueue.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export interface ProjectJob {
3333
problem: string,
3434
timelimit: number,
3535
scenario: string,
36-
submissionDirs: string
36+
lockedFiles: string
3737
}
3838

3939
export type JudgeJob = RunJob | SubmissionJob | ProjectJob

‎src/routes/api/project/controller.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default {
3232
source: req.body.submission,
3333
problem: req.body.problem,
3434
lang: req.body.lang,
35-
submissionDirs: req.body.submissionDirs,
35+
lockedFiles: req.body.lockedFiles,
3636
timelimit: req.body.timelimit,
3737
scenario: 'project'
3838
})

‎src/routes/api/project/validators.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ export default class ProjectValidator extends BaseValidator {
2222
.string()
2323
.uri()
2424
.required(),
25-
submissionDirs: Joi
26-
.string()
25+
lockedFiles: Joi
26+
.array()
27+
.items(Joi.string())
28+
.min(1)
2729
.required(),
2830
mode: Joi
2931
.string()

‎test/e2e/ProjectScenario.spec.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe('POST api/project', () => {
6666
const params = {
6767
lang: 'node',
6868
submission: 'https://minio.cb.lk/public/input',
69-
submissionDirs: 'src',
69+
lockedFiles: ['package.json','yarn.lock','test'],
7070
mode: 'sync',
7171
timelimit: 1
7272
};
@@ -85,7 +85,7 @@ describe('POST api/project', () => {
8585
lang: 'node',
8686
problem: 'not-a-url',
8787
submission: 'https://minio.cb.lk/public/input',
88-
submissionDirs: 'src',
88+
lockedFiles: ['package.json','yarn.lock','test'],
8989
mode: 'sync',
9090
timelimit: 1
9191
};
@@ -103,7 +103,7 @@ describe('POST api/project', () => {
103103
const params = {
104104
lang: 'node',
105105
problem: 'https://minio.cb.lk/public/input',
106-
submissionDirs: 'src',
106+
lockedFiles: ['package.json','yarn.lock','test'],
107107
mode: 'sync',
108108
timelimit: 1
109109
};
@@ -122,7 +122,7 @@ describe('POST api/project', () => {
122122
lang: 'node',
123123
problem: 'https://minio.cb.lk/public/input',
124124
submission: 'not-a-url',
125-
submissionDirs: 'src',
125+
lockedFiles: ['package.json','yarn.lock','test'],
126126
mode: 'sync',
127127
timelimit: 1
128128
};
@@ -136,7 +136,7 @@ describe('POST api/project', () => {
136136
expect(res.body.err.message).to.equal('"submission" must be a valid uri');
137137
});
138138

139-
it('should throw 400 error for submissionDirs missing', async () => {
139+
it('should throw 400 error for lockedFiles missing', async () => {
140140
const params = {
141141
lang: 'node',
142142
problem: 'https://minio.cb.lk/public/input',
@@ -151,15 +151,15 @@ describe('POST api/project', () => {
151151
}).send(params);
152152

153153
expect(res.status).to.equal(400);
154-
expect(res.body.err.message).to.equal('"submissionDirs" is required');
154+
expect(res.body.err.message).to.equal('"lockedFiles" is required');
155155
});
156156

157-
it('should throw 400 error when submissionDirs is not a string', async () => {
157+
it('should throw 400 error when lockedFiles is not a string', async () => {
158158
const params = {
159159
lang: 'node',
160160
problem: 'https://minio.cb.lk/public/input',
161161
submission: 'https://minio.cb.lk/public/input',
162-
submissionDirs: 123,
162+
lockedFiles: 123,
163163
mode: 'sync',
164164
timelimit: 1
165165
};
@@ -170,15 +170,15 @@ describe('POST api/project', () => {
170170
}).send(params);
171171

172172
expect(res.status).to.equal(400);
173-
expect(res.body.err.message).to.equal('"submissionDirs" must be a string');
173+
expect(res.body.err.message).to.equal('"lockedFiles" must be an array');
174174
});
175175

176176
it('should throw 400 error for incorrect mode ', async () => {
177177
const params = {
178178
lang: 'node',
179179
problem: 'https://minio.cb.lk/public/input',
180180
submission: 'https://minio.cb.lk/public/input',
181-
submissionDirs: 'src',
181+
lockedFiles: ['package.json','yarn.lock','test'],
182182
mode: 'abc',
183183
timelimit: 1
184184
};
@@ -197,7 +197,7 @@ describe('POST api/project', () => {
197197
lang: 'node',
198198
problem: 'https://minio.cb.lk/public/input',
199199
submission: 'https://minio.cb.lk/public/input',
200-
submissionDirs: 'src',
200+
lockedFiles: ['package.json','yarn.lock','test'],
201201
mode: 'callback',
202202
timelimit: 1
203203
};
@@ -216,7 +216,7 @@ describe('POST api/project', () => {
216216
lang: 'node',
217217
problem: 'https://minio.cb.lk/public/input',
218218
submission: 'https://minio.cb.lk/public/input',
219-
submissionDirs: 'src',
219+
lockedFiles: ['package.json','yarn.lock','test'],
220220
mode: 'sync',
221221
timelimit: 1
222222
};
@@ -236,7 +236,7 @@ describe('POST api/project', () => {
236236
lang: 'node',
237237
problem: 'https://minio.cb.lk/public/input',
238238
submission: 'https://minio.cb.lk/public/input',
239-
submissionDirs: 'src',
239+
lockedFiles: ['package.json','yarn.lock','test'],
240240
mode: 'poll',
241241
timelimit: 1
242242
};
@@ -261,7 +261,7 @@ describe('POST api/project', () => {
261261
lang: 'node',
262262
problem: 'https://minio.cb.lk/public/input',
263263
submission: 'https://minio.cb.lk/public/input',
264-
submissionDirs: 'src',
264+
lockedFiles: ['package.json','yarn.lock','test'],
265265
mode: 'callback',
266266
callback: 'http://localhost:2404',
267267
timelimit: 1

‎test/unit/validators/ProjectValidator.spec.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('SubmitValidator', async () => {
3131
body: {
3232
problem: 'https://minio.cb.lk/public/input',
3333
submission: 'https://minio.cb.lk/public/input',
34-
submissionDirs: 'src',
34+
lockedFiles: ['package.json','yarn.lock','test'],
3535
mode: 'poll',
3636
timelimit: 1
3737
}
@@ -49,7 +49,7 @@ describe('SubmitValidator', async () => {
4949
body: {
5050
lang: 'node',
5151
submission: 'https://minio.cb.lk/public/input',
52-
submissionDirs: 'src',
52+
lockedFiles: ['package.json','yarn.lock','test'],
5353
mode: 'poll',
5454
timelimit: 1
5555
}
@@ -68,7 +68,7 @@ describe('SubmitValidator', async () => {
6868
lang: 'node',
6969
problem: 'not-a-url',
7070
submission: 'https://minio.cb.lk/public/input',
71-
submissionDirs: 'src',
71+
lockedFiles: ['package.json','yarn.lock','test'],
7272
mode: 'poll',
7373
timelimit: 1
7474
}
@@ -87,7 +87,7 @@ describe('SubmitValidator', async () => {
8787
lang: 'node',
8888
problem: 123,
8989
submission: 'https://minio.cb.lk/public/input',
90-
submissionDirs: 'src',
90+
lockedFiles: ['package.json','yarn.lock','test'],
9191
mode: 'poll',
9292
timelimit: 1
9393
}
@@ -105,7 +105,7 @@ describe('SubmitValidator', async () => {
105105
body: {
106106
lang: 'node',
107107
problem: 'https://minio.cb.lk/public/input',
108-
submissionDirs: 'src',
108+
lockedFiles: ['package.json','yarn.lock','test'],
109109
mode: 'poll',
110110
timelimit: 1
111111
}
@@ -124,7 +124,7 @@ describe('SubmitValidator', async () => {
124124
lang: 'node',
125125
problem: 'https://minio.cb.lk/public/input',
126126
submission: 'not-a-url',
127-
submissionDirs: 'src',
127+
lockedFiles: ['package.json','yarn.lock','test'],
128128
mode: 'poll',
129129
timelimit: 1
130130
}
@@ -143,7 +143,7 @@ describe('SubmitValidator', async () => {
143143
lang: 'node',
144144
problem: 'https://minio.cb.lk/public/input',
145145
submission: 123,
146-
submissionDirs: 'src',
146+
lockedFiles: ['package.json','yarn.lock','test'],
147147
mode: 'poll',
148148
timelimit: 1
149149
}
@@ -162,7 +162,7 @@ describe('SubmitValidator', async () => {
162162
lang: 'node',
163163
problem: 'https://minio.cb.lk/public/input',
164164
submission: 'https://minio.cb.lk/public/input',
165-
submissionDirs: 'src',
165+
lockedFiles: ['package.json','yarn.lock','test'],
166166
timelimit: 1
167167
}
168168
};
@@ -178,7 +178,7 @@ describe('SubmitValidator', async () => {
178178
lang: 'node',
179179
problem: 'https://minio.cb.lk/public/input',
180180
submission: 'https://minio.cb.lk/public/input',
181-
submissionDirs: 'src',
181+
lockedFiles: ['package.json','yarn.lock','test'],
182182
mode: 123,
183183
timelimit: 1
184184
}
@@ -195,7 +195,7 @@ describe('SubmitValidator', async () => {
195195
lang: 'node',
196196
problem: 'https://minio.cb.lk/public/input',
197197
submission: 'https://minio.cb.lk/public/input',
198-
submissionDirs: 'src',
198+
lockedFiles: ['package.json','yarn.lock','test'],
199199
mode: 'wrongMode',
200200
timelimit: 1
201201
}
@@ -214,7 +214,7 @@ describe('SubmitValidator', async () => {
214214
lang: 'node',
215215
problem: 'https://minio.cb.lk/public/input',
216216
submission: 'https://minio.cb.lk/public/input',
217-
submissionDirs: 'src',
217+
lockedFiles: ['package.json','yarn.lock','test'],
218218
mode: 'callback',
219219
timelimit: 1
220220
}
@@ -233,7 +233,7 @@ describe('SubmitValidator', async () => {
233233
lang: 'node',
234234
problem: 'https://minio.cb.lk/public/input',
235235
submission: 'https://minio.cb.lk/public/input',
236-
submissionDirs: 'src',
236+
lockedFiles: ['package.json','yarn.lock','test'],
237237
mode: 'poll',
238238
timelimit: 'abc'
239239
}
@@ -252,7 +252,7 @@ describe('SubmitValidator', async () => {
252252
lang: 'node',
253253
problem: 'https://minio.cb.lk/public/input',
254254
submission: 'https://minio.cb.lk/public/input',
255-
submissionDirs: 'src',
255+
lockedFiles: ['package.json','yarn.lock','test'],
256256
mode: 'poll',
257257
timelimit: 1
258258
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /