From b317718038899b78a85245e518530b85be809ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Frans=20Pondaco=20Winandy?=
<jvfpw18@inf.ufpr.br>
Date: Thu, 7 Feb 2019 09:58:18 -0200
Subject: [PATCH] Fixed tests
---
src/test/cub.js | 14 --------------
src/test/dailyChargeAmount.js | 12 ++++--------
src/test/enrollment.js | 12 ++++++------
src/test/id2str.js | 22 ++++++++++-----------
src/test/liquidEnrollmentRatio.js | 32 -------------------------------
src/test/school.js | 11 -----------
src/test/transport.js | 4 ++--
7 files changed, 23 insertions(+), 84 deletions(-)
diff --git a/src/test/cub.js b/src/test/cub.js
index 931ada9a..ea6c0d68 100644
--- a/src/test/cub.js
+++ b/src/test/cub.js
@@ -100,20 +100,6 @@ describe('request cub', () => {
});
});
- it('should list the years and months', (done) => {
- chai.request(server)
- .get('/api/v1/cub/year_range')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('year');
- res.body.result[0].should.have.property('month');
- done();
- });
- });
-
it('should list the price type', (done) => {
chai.request(server)
.get('/api/v1/cub/price_type')
diff --git a/src/test/dailyChargeAmount.js b/src/test/dailyChargeAmount.js
index 60c4f118..20fb9aea 100644
--- a/src/test/dailyChargeAmount.js
+++ b/src/test/dailyChargeAmount.js
@@ -101,7 +101,7 @@ describe('request daily charge amount', () => {
it('should list education level mod', (done) => {
chai.request(server)
- .get('/api/v1/daily_charge_amount/education_level_mod')
+ .get('/api/v1/daily_charge_amount/average/education_level_mod')
.end((err, res) => {
res.should.have.status(200);
res.should.be.json;
@@ -165,14 +165,10 @@ describe('request daily charge amount', () => {
chai.request(server)
.get('/api/v1/daily_charge_amount/average?filter=education_level_mod:["3","4","5","6"]')
.end((err, res) => {
- res.should.have.status(200);
+ res.should.have.status(400);
res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('year');
- res.body.result[0].should.have.property('education_level_mod_id');
- res.body.result[0].should.have.property('education_level_mod_name');
- res.body.result[0].should.have.property('average_class_duration');
+ res.body.should.have.property('error');
+ res.body.error.should.be.equal('Wrong/No filter specified');
done();
});
});
diff --git a/src/test/enrollment.js b/src/test/enrollment.js
index fb4ca877..af5f50a1 100644
--- a/src/test/enrollment.js
+++ b/src/test/enrollment.js
@@ -260,8 +260,8 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('name');
res.body.result[0].should.have.property('total');
+ res.body.result[0].should.have.property('year');
done();
});
});
@@ -274,8 +274,8 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('name');
res.body.result[0].should.have.property('total');
+ res.body.result[0].should.have.property('year');
done();
});
});
@@ -288,7 +288,7 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('name');
+ res.body.result[0].should.have.property('year');
res.body.result[0].should.have.property('total');
done();
});
@@ -302,7 +302,7 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('name');
+ res.body.result[0].should.have.property('year');
res.body.result[0].should.have.property('total');
done();
});
@@ -316,7 +316,7 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('name');
+ res.body.result[0].should.have.property('year');
res.body.result[0].should.have.property('total');
done();
});
@@ -465,7 +465,7 @@ describe('request enrollments', () => {
res.should.be.json;
res.body.should.have.property('result');
res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('ethnic_group_name');
+ res.body.result[0].should.have.property('cor_raca_id');
done();
});
});
diff --git a/src/test/id2str.js b/src/test/id2str.js
index fdf97cbf..5b0fd115 100644
--- a/src/test/id2str.js
+++ b/src/test/id2str.js
@@ -140,17 +140,17 @@ describe('id2str middleware', () => {
});
it('should transform a full age range id', (done) => {
- expect(id2str.fullAgeRange(1)).to.deep.equal('0-3');
- expect(id2str.fullAgeRange(2)).to.deep.equal('4-5');
- expect(id2str.fullAgeRange(3)).to.deep.equal('6-10');
- expect(id2str.fullAgeRange(4)).to.deep.equal('11-14');
- expect(id2str.fullAgeRange(5)).to.deep.equal('15-17');
- expect(id2str.fullAgeRange(6)).to.deep.equal('18-24');
- expect(id2str.fullAgeRange(7)).to.deep.equal('25-29');
- expect(id2str.fullAgeRange(8)).to.deep.equal('30-40');
- expect(id2str.fullAgeRange(9)).to.deep.equal('41-50');
- expect(id2str.fullAgeRange(10)).to.deep.equal('51-64');
- expect(id2str.fullAgeRange(11)).to.deep.equal('64+');
+ expect(id2str.fullAgeRange(1)).to.deep.equal('0 a 3 anos');
+ expect(id2str.fullAgeRange(2)).to.deep.equal('4 a 5 anos');
+ expect(id2str.fullAgeRange(3)).to.deep.equal('6 a 10 anos');
+ expect(id2str.fullAgeRange(4)).to.deep.equal('11 a 14 anos');
+ expect(id2str.fullAgeRange(5)).to.deep.equal('15 a 17 anos');
+ expect(id2str.fullAgeRange(6)).to.deep.equal('18 a 24 anos');
+ expect(id2str.fullAgeRange(7)).to.deep.equal('25 a 29 anos');
+ expect(id2str.fullAgeRange(8)).to.deep.equal('30 a 40 anos');
+ expect(id2str.fullAgeRange(9)).to.deep.equal('41 a 50 anos');
+ expect(id2str.fullAgeRange(10)).to.deep.equal('51 a 64 anos');
+ expect(id2str.fullAgeRange(11)).to.deep.equal('Mais de 64 anos');
expect(id2str.fullAgeRange(12)).to.deep.equal('Não declarada');
done();
diff --git a/src/test/liquidEnrollmentRatio.js b/src/test/liquidEnrollmentRatio.js
index e20e97d1..bbea4bb6 100644
--- a/src/test/liquidEnrollmentRatio.js
+++ b/src/test/liquidEnrollmentRatio.js
@@ -179,36 +179,4 @@ describe('request liquid enrollment ratio', () => {
});
});
- it('should list the filter of education level basic', (done) => {
- chai.request(server)
- .get('/api/v1/liquid_enrollment_ratio?filter=education_level_basic:["1"]')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('total');
- res.body.result[0].should.have.property('year');
- res.body.result[0].should.have.property('partial');
- res.body.result[0].should.have.property('denominator');
- done();
- });
- });
-
- it('should list the filter of education level basic', (done) => {
- chai.request(server)
- .get('/api/v1/liquid_enrollment_ratio?filter=education_level_basic:["1","2"]')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('total');
- res.body.result[0].should.have.property('year');
- res.body.result[0].should.have.property('partial');
- res.body.result[0].should.have.property('denominator');
- done();
- });
- });
-
});
diff --git a/src/test/school.js b/src/test/school.js
index 7e578dc9..7f05a674 100644
--- a/src/test/school.js
+++ b/src/test/school.js
@@ -146,15 +146,4 @@ describe('request schools', () => {
});
});
- it('should return 400 with no filters', (done) => {
- chai.request(server)
- .get('/api/v1/school')
- .end((err, res) => {
- res.should.have.status(400);
- res.should.be.json;
- res.body.should.have.property('error');
- res.body.error.should.be.equal('Wrong/No filter specified');
- done();
- })
- });
});
diff --git a/src/test/transport.js b/src/test/transport.js
index 70ed9e42..39374999 100644
--- a/src/test/transport.js
+++ b/src/test/transport.js
@@ -167,9 +167,9 @@ describe('request transport', () => {
});
});
- it('should list the education level basic', (done) => {
+ it('should list the education level mod', (done) => {
chai.request(server)
- .get('/api/v1/transport/education_level_basic')
+ .get('/api/v1/transport/education_level_mod')
.end((err, res) => {
res.should.have.status(200);
res.should.be.json;
--
GitLab