test: fix tests

Author: Vincent Molinié

src/utils/operators.js

@@ -1,9 +1,13 @@
 class Operators {
   static _instance = null;
 
+  static _isNewSequelizeOp(options) {
+    return !!(options && options.Sequelize && options.Sequelize.Op);
+  }
+
   constructor(options) {
-    if (options && options.sequelize && options.sequelize.Op) {
-      const { Op } = options.sequelize;
+    if (Operators._isNewSequelizeOp(options)) {
+      const { Op } = options.Sequelize;
       this.AND = Op.and;
       this.CONTAINS = Op.contains;
       this.EQ = Op.eq;

test/utils/operators.test.js

@@ -1,5 +1,5 @@
-const sequelize = require('sequelize');
-const Operators = require('../../src/utils/operators');
+import Sequelize from 'sequelize';
+import Operators from '../../src/utils/operators';
 
 describe('utils > operators', () => {
   describe('with an old sequelize', () => {
@@ -27,20 +27,31 @@ describe('utils > operators', () => {
     it('should return a valid operator', () => {
       expect.assertions(13);
 
-      const Op = new Operators({ sequelize });
-      expect(Op.AND).toStrictEqual(sequelize.Op.and);
-      expect(Op.CONTAINS).toStrictEqual(sequelize.Op.contains);
-      expect(Op.EQ).toStrictEqual(sequelize.Op.eq);
-      expect(Op.GT).toStrictEqual(sequelize.Op.gt);
-      expect(Op.GTE).toStrictEqual(sequelize.Op.gte);
-      expect(Op.IN).toStrictEqual(sequelize.Op.in);
-      expect(Op.LIKE).toStrictEqual(sequelize.Op.like);
-      expect(Op.LT).toStrictEqual(sequelize.Op.lt);
-      expect(Op.LTE).toStrictEqual(sequelize.Op.lte);
-      expect(Op.NE).toStrictEqual(sequelize.Op.ne);
-      expect(Op.NOT).toStrictEqual(sequelize.Op.not);
-      expect(Op.NOT_LIKE).toStrictEqual(sequelize.Op.notLike);
-      expect(Op.OR).toStrictEqual(sequelize.Op.or);
+      const Op = new Operators({ Sequelize });
+      expect(Op.AND).toStrictEqual(Sequelize.Op.and);
+      expect(Op.CONTAINS).toStrictEqual(Sequelize.Op.contains);
+      expect(Op.EQ).toStrictEqual(Sequelize.Op.eq);
+      expect(Op.GT).toStrictEqual(Sequelize.Op.gt);
+      expect(Op.GTE).toStrictEqual(Sequelize.Op.gte);
+      expect(Op.IN).toStrictEqual(Sequelize.Op.in);
+      expect(Op.LIKE).toStrictEqual(Sequelize.Op.like);
+      expect(Op.LT).toStrictEqual(Sequelize.Op.lt);
+      expect(Op.LTE).toStrictEqual(Sequelize.Op.lte);
+      expect(Op.NE).toStrictEqual(Sequelize.Op.ne);
+      expect(Op.NOT).toStrictEqual(Sequelize.Op.not);
+      expect(Op.NOT_LIKE).toStrictEqual(Sequelize.Op.notLike);
+      expect(Op.OR).toStrictEqual(Sequelize.Op.or);
+    });
+  });
+
+  describe('getInstance', () => {
+    it('should return the same object', () => {
+      expect.assertions(1);
+
+      const emptyOptions = {};
+      const Op = Operators.getInstance(emptyOptions);
+
+      expect(Op).toStrictEqual(Operators.getInstance(emptyOptions));
     });
   });
 });