fix(model/aggregate): inject scope before conforming options (#9190)

lib/model.js

@@ -1779,8 +1779,8 @@ class Model {
     options = Utils.cloneDeep(options);
     options = _.defaults(options, { attributes: [] });
 
-    this._conformOptions(options, this);
     this._injectScope(options);
+    this._conformOptions(options, this);
 
     if (options.include) {
       this._expandIncludeAll(options);

test/integration/model/scope/count.test.js

@@ -45,6 +45,26 @@ describe(Support.getTestDialectTeaser('Model'), () => {
                   priority: 1
                 }
               }]
+            },
+            withIncludeFunction: () => {
+              return {
+                include: [{
+                  model: this.Child,
+                  where: {
+                    priority: 1
+                  }
+                }]
+              };
+            },
+            withIncludeFunctionAndStringAssociation: () => {
+              return {
+                include: [{
+                  association: 'Children',
+                  where: {
+                    priority: 1
+                  }
+                }]
+              };
             }
           }
         });
@@ -100,6 +120,14 @@ describe(Support.getTestDialectTeaser('Model'), () => {
       it('should be able to use where on include', function() {
         return expect(this.ScopeMe.scope('withInclude').count()).to.eventually.equal(1);
       });
+
+      it('should be able to use include with function scope', function() {
+        return expect(this.ScopeMe.scope('withIncludeFunction').count()).to.eventually.equal(1);
+      });
+
+      it('should be able to use include with function scope and string association', function() {
+        return expect(this.ScopeMe.scope('withIncludeFunctionAndStringAssociation').count()).to.eventually.equal(1);
+      });
     });
   });
 });