Skip to content
Snippets Groups Projects
Commit ddde6207 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'fix_teacher' into development

Merges !54
parents 22431c0d 96bb0764
No related branches found
No related tags found
1 merge request!116Release v1.0.0
Pipeline #
...@@ -238,7 +238,8 @@ rqf.addField({ ...@@ -238,7 +238,8 @@ rqf.addField({
resultField: 'ethnic_group_id', resultField: 'ethnic_group_id',
where: { where: {
relation: '=', relation: '=',
type: 'integer' type: 'integer',
field: 'cor_raca_id'
} }
}); });
......
...@@ -417,8 +417,8 @@ describe('request enrollments', () => { ...@@ -417,8 +417,8 @@ describe('request enrollments', () => {
res.should.be.json; res.should.be.json;
res.body.should.have.property('result'); res.body.should.have.property('result');
res.body.result.should.be.a('array'); res.body.result.should.be.a('array');
res.body.result[0].should.have.property('period_name'); res.body.result[0].should.have.property('integral_time_name');
res.body.result[0].should.not.have.property('period_id'); res.body.result[0].should.not.have.property('integral_time_id');
done(); done();
}); });
}); });
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment