fixes same issue for unscoped

Author: RobinBuschmann

lib/models/v3/Model.ts

@@ -37,7 +37,7 @@ export const Model: any = (() => {
 
  let targetModel = this.Model;
 
- if (this.scoped) {
+ if (this.scoped !== undefined) {
  // Adds scope info to 'this' context
  targetModel = Object.create(targetModel);
  targetModel.$scope = this.$scope;
@@ -49,9 +49,9 @@ export const Model: any = (() => {
  }
  });
 
- // 'scope' need to be called with 'this'context
+ // 'scope' and 'unscoped' need to be called with 'this' context
  // instead of 'this.Model' context
- _Model['scope'] = function(...args: any[]): any {
+ _Model['scope'] = _Model['unscoped'] = function(...args: any[]): any {
  return SeqModelProto.scope.call(this, ...args);
  };
 

test/specs/scopes.spec.ts

@@ -72,6 +72,16 @@ describe('scopes', () => {
  })
  );
 
+ it('should not consider default scope due to unscoped call', () =>
+
+ ShoeWithScopes
+ .unscoped()
+ .findOne()
+ .then(shoe => {
+ expect(shoe).to.have.property('secretKey').which.is.not.null;
+ })
+ );
+
  describe('with include options', () => {
 
  it('should consider scopes and additional included model (object)', () =>
@@ -104,6 +114,32 @@ describe('scopes', () => {
  ).not.to.be.rejected
  );
 
+ it('should not consider default scope due to unscoped call, but additonal includes (object)', () =>
+
+ ShoeWithScopes
+ .unscoped()
+ .findOne({
+ include: [{model: Person}]
+ })
+ .then(shoe => {
+ expect(shoe).to.have.property('secretKey').which.is.not.null;
+ expect(shoe).to.have.property('owner').which.is.not.null;
+ })
+ );
+
+ it('should not consider default scope due to unscoped call, but additonal includes (model)', () =>
+
+ ShoeWithScopes
+ .unscoped()
+ .findOne({
+ include: [Person]
+ })
+ .then(shoe => {
+ expect(shoe).to.have.property('secretKey').which.is.not.null;
+ expect(shoe).to.have.property('owner').which.is.not.null;
+ })
+ );
+
  });
 
  });