Explorar el Código

Use sequelize.sync rather than individual models

sbkwgh hace 8 años
padre
commit
29564c29a6
Se han modificado 3 ficheros con 31 adiciones y 17 borrados
  1. 2 15
      test/admin_token.js
  2. 27 0
      test/thread_post.js
  3. 2 2
      test/user.js

+ 2 - 15
test/admin_token.js

@@ -4,9 +4,7 @@ let chai = require('chai')
 let server = require('../server')
 let should = chai.should()
 
-let Models = require('../models')
-let User = Models.User
-let AdminToken = Models.AdminToken
+let { sequelize } = require('../models')
 
 const Errors = require('../lib/errors.js')
 
@@ -23,18 +21,7 @@ describe('AdminToken', () => {
 
 	//Delete all rows in table after
 	//tests completed
-	after((done) => {
-		Promise.all([
-			User.sync({ force: true }),
-			AdminToken.sync({ force: true })
-		])
-			.then(() => {
-				done(null);
-			})
-			.catch((err) => {
-				done(err)
-			})
-	})
+	after(() => sequelize.sync({ force: true }))
 
 	describe('POST /admin_token', async () => {
 		let token

+ 27 - 0
test/thread_post.js

@@ -0,0 +1,27 @@
+process.env.NODE_ENV = 'test'
+
+let chai = require('chai')
+let server = require('../server')
+let should = chai.should()
+
+let { sequelize } = require('../models')
+
+const Errors = require('../lib/errors.js')
+
+chai.use(require('chai-http'))
+chai.use(require('chai-things'))
+
+describe('Thread and post', () => {
+	//Wait for app to start before commencing
+	before((done) => {
+		server.on('appStarted', () => {
+			done()
+		})
+	})
+
+	//Delete all rows in table after
+	//tests completed
+	after(() => {
+		sequelize.sync({ force: true })
+	})
+})

+ 2 - 2
test/user.js

@@ -5,7 +5,7 @@ let chai = require('chai')
 let server = require('../server')
 let should = chai.should()
 
-let User = require('../models').User
+let { sequelize } = require('../models')
 const Errors = require('../lib/errors.js')
 
 chai.use(require('chai-http'))
@@ -21,7 +21,7 @@ describe('User', () => {
 
 	//Delete all rows in table after
 	//tests completed
-	after(() => User.sync({ force: true }) )
+	after(() => sequelize.sync({ force: true }) )
 
 	describe('/ POST user', () => {
 		it('should create an account', (done) => {