(test) findAndCountAll regression with sequelize.or (#6078)

test/integration/include/findAndCountAll.test.js

@@ -292,5 +292,57 @@ describe(Support.getTestDialectTeaser('Include'), function() {
           expect(result.rows.length).to.equal(1);
           expect(result.rows.length).to.equal(1);
       });
       });
     });
     });
+
+    it('should properly work with sequelize.function', function() {
+      var sequelize = this.sequelize;
+      var User = this.sequelize.define('User', {
+        id: { type: DataTypes.INTEGER, allowNull: false, primaryKey: true, autoIncrement: true },
+        first_name: { type: DataTypes.STRING },
+        last_name: { type: DataTypes.STRING }
+      });
+
+      var Project = this.sequelize.define('Project', {
+        id: { type: DataTypes.INTEGER, allowNull: false, primaryKey: true, autoIncrement: true },
+        name: { type: DataTypes.STRING}
+      });
+
+      User.hasMany(Project);
+
+      return this.sequelize.sync({ force: true }).then(function() {
+        return User.bulkCreate([
+          { first_name: 'user-fname-1', last_name: 'user-lname-1' },
+          { first_name: 'user-fname-2', last_name: 'user-lname-2' },
+          { first_name: 'user-xfname-1', last_name: 'user-xlname-1' }
+        ]);
+      }).then(function(u) {
+        return Project.bulkCreate([
+          { name: 'naam-satya', UserId: 1},
+          { name: 'guru-satya', UserId: 2},
+          { name: 'app-satya', UserId: 2}
+        ]);
+      }).then(function() {
+        return User.findAndCountAll({
+          limit: 1,
+          offset: 1,
+          where: sequelize.or(
+              { first_name : { like: '%user-fname%' } },
+              { last_name : { like: '%user-lname%' } }
+          ),
+          include: [
+            {
+              model: Project,
+              required: true,
+              where: { name: {
+                $in: ['naam-satya', 'guru-satya']
+              }}
+            }
+          ]
+        });
+      }).then(function(result) {
+        expect(result.count).to.equal(2);
+        expect(result.rows.length).to.equal(1);
+      });
+
+    });
   });
   });
 });
 });