tests added for through options

Author: RobinBuschmann

package.json

@@ -12,7 +12,7 @@
     "test-v4": "npm run prepare-test-v4 && npm run exec-tests",
     "cover-v3": "npm run prepare-test-v3 && nyc --exclude lib/models/v4/**/*.js mocha",
     "cover-v4": "npm run prepare-test-v4 && nyc --exclude lib/models/v3/**/*.js mocha",
-    "exec-tests": "mocha test/specs/",
+    "exec-tests": "mocha",
     "test": "npm run test-v4 && npm run test-v3",
     "cover": "npm run cover-v4",
     "lint": "tslint ."

test/specs/association.spec.ts

@@ -12,6 +12,7 @@ import {
 import {expectAutoGeneratedFunctions} from "../utils/association";
 import {assertInstance} from "../utils/common";
 import {AllowNull} from "../../lib/annotations/AllowNull";
+import {PrimaryKey} from '../../lib/annotations/PrimaryKey';
 
 use(chaiAsPromised);
 
@@ -1338,6 +1339,135 @@ describe('association', () => {
 
       manyToManyTestSuites(Book3, Author3);
     });
+
+    describe('set through model via through options', () => {
+
+      @Table
+      class Book66 extends Model<Book66> {
+
+        @Column
+        title: string;
+
+        @BelongsToMany(() => Author66, {
+          through: {
+            model: () => AuthorBook66,
+          }
+        })
+        authors: Author66[];
+      }
+
+      @Table
+      class AuthorBook66 extends Model<AuthorBook66> {
+
+        @ForeignKey(() => Book66)
+        bookId: number;
+
+        @ForeignKey(() => Author66)
+        authorId: number;
+      }
+
+      @Table
+      class Author66 extends Model<Author66> {
+
+        @Column
+        name: string;
+
+        @BelongsToMany(() => Book66, {
+          through: {
+            model: () => AuthorBook66,
+          }
+        })
+        books: Book66;
+      }
+
+      manyToManyTestSuites(Book66, Author66, AuthorBook66);
+    });
+
+    describe('set through model string via through options', () => {
+
+      @Table
+      class Book66 extends Model<Book66> {
+
+        @Column
+        title: string;
+
+        @BelongsToMany(() => Author66, {
+          through: {
+            model: 'AuthorBook66',
+          },
+          foreignKey: 'bookId',
+          otherKey: 'authorId',
+        })
+        authors: Author66[];
+      }
+
+      @Table
+      class Author66 extends Model<Author66> {
+
+        @Column
+        name: string;
+
+        @BelongsToMany(() => Book66, {
+          through: {
+            model: 'AuthorBook66',
+          },
+          foreignKey: 'authorId',
+          otherKey: 'bookId',
+        })
+        books: Book66;
+      }
+
+      manyToManyTestSuites(Book66, Author66);
+    });
+
+    describe('ThroughOptions', () => {
+
+      @Table
+      class User77 extends Model<User77> {
+
+        @Column
+        name: string;
+
+        @BelongsToMany(() => User77, {
+          through: {
+            model: () => Subscription,
+            scope: {
+              targetType: 'user'
+            }
+          },
+          foreignKeyConstraint: true,
+          foreignKey:  'subscriberId',
+          otherKey: 'targetId',
+          constraints: false,
+        })
+        usersSubscribedTo: User77[];
+      }
+
+      @Table
+      class Subscription extends Model<Subscription> {
+
+        @PrimaryKey
+        @ForeignKey(() => User77)
+        @Column
+        subscriberId: number;
+
+        @PrimaryKey
+        @Column
+        targetId: number;
+
+        @Column
+        targetType: string;
+      }
+
+      sequelize.addModels([User77, Subscription]);
+
+      it('should set scope in pure sequelize association options', () => {
+        expect(User77['associations'].usersSubscribedTo.through)
+          .to.have.property('scope').that.eqls({targetType: 'user'});
+      });
+
+    });
+
   });
 
   describe('One-to-one', () => {

test/specs/model-methods.spec.ts

@@ -8,38 +8,38 @@ describe('model-methods', () => {
   const sequelize = createSequelize();
 
   @Table
-  class User extends Model<User> {
+  class User777 extends Model<User777> {
 
     @Column
     firstName: string;
 
     @Column
     lastName: string;
 
-    static createDemoUser(): User {
+    static createDemoUser(): User777 {
 
-      return new User({firstName: 'Peter', lastName: 'Parker'});
+      return new User777({firstName: 'Peter', lastName: 'Parker'});
     }
 
-    static findDemoUser(): Promise<User> {
+    static findDemoUser(): Promise<User777> {
 
-      return this.findOne<User>({where: {firstName: 'Peter', lastName: 'Parker'}});
+      return this.findOne<User777>({where: {firstName: 'Peter', lastName: 'Parker'}});
     }
   }
 
-  sequelize.addModels([User]);
+  sequelize.addModels([User777]);
 
   beforeEach(() => sequelize.sync({force: true}));
 
   it('should work as expected', () => {
 
-    const user = User.createDemoUser();
+    const user = User777.createDemoUser();
 
-    expect(user).to.be.an.instanceOf(User);
+    expect(user).to.be.an.instanceOf(User777);
 
     return user
       .save()
-      .then(() => User.findDemoUser())
+      .then(() => User777.findDemoUser())
       .then(_user => expect(_user.equals(user)).to.be.true)
     ;
   });