fix(model.reload): ignore options.where and always use this.where() (#12211)

lib/model.js

@@ -4049,8 +4049,9 @@ class Model {
    * @returns {Promise<Model>}
    * @returns {Promise<Model>}
    */
    */
   async reload(options) {
   async reload(options) {
-    options = Utils.defaults({}, options, {
-      where: this.where(),
+    options = Utils.defaults({
+      where: this.where()
+    }, options, {
       include: this._options.include || null
       include: this._options.include || null
     });
     });
 
 

test/integration/instance/reload.test.js

@@ -91,6 +91,20 @@ describe(Support.getTestDialectTeaser('Instance'), () => {
       });
       });
     });
     });
 
 
+    it('should use default internal where', async function() {
+      const user = await this.User.create({ username: 'Balak Bukhara' });
+      const anotherUser = await this.User.create({ username: 'John Smith' });
+
+      const primaryKey = user.get('id');
+
+      await user.reload();
+      expect(user.get('id')).to.equal(primaryKey);
+
+      // options.where should be ignored
+      await user.reload({ where: { id: anotherUser.get('id') } });
+      expect(user.get('id')).to.equal(primaryKey).and.not.equal(anotherUser.get('id'));
+    });
+
     it('should update the values on all references to the DAO', function() {
     it('should update the values on all references to the DAO', function() {
       return this.User.create({ username: 'John Doe' }).then(originalUser => {
       return this.User.create({ username: 'John Doe' }).then(originalUser => {
         return this.User.findByPk(originalUser.id).then(updater => {
         return this.User.findByPk(originalUser.id).then(updater => {