From dde823128fac0f5ba1e1aa93874ae41067a79121 Mon Sep 17 00:00:00 2001
From: kirrg001 <katharina.irrgang@googlemail.com>
Date: Mon, 25 Jul 2016 19:13:25 +0200
Subject: [PATCH] improvement: set activeTimezone when transforming dates

no issue
---
 .../fixtures/006/01-transform-dates-into-utc.js          | 7 +++++++
 core/test/unit/migration_fixture_spec.js                 | 9 +--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/server/data/migration/fixtures/006/01-transform-dates-into-utc.js b/core/server/data/migration/fixtures/006/01-transform-dates-into-utc.js
index 88acd61d09db..eca5b2c93129 100644
--- a/core/server/data/migration/fixtures/006/01-transform-dates-into-utc.js
+++ b/core/server/data/migration/fixtures/006/01-transform-dates-into-utc.js
@@ -186,6 +186,13 @@ module.exports = function transformDatesIntoUTC(options, logger) {
                 });
             });
         },
+        function setActiveTimezone() {
+            var timezone = config.forceTimezoneOnMigration || moment.tz.guess();
+            return models.Settings.edit({
+                key: 'activeTimezone',
+                value: timezone
+            }, options);
+        },
         function addMigrationSettingsEntry() {
             settingsMigrations[settingsKey] = moment().format();
             return models.Settings.edit({
diff --git a/core/test/unit/migration_fixture_spec.js b/core/test/unit/migration_fixture_spec.js
index ee49f14c8919..f191b7e337f8 100644
--- a/core/test/unit/migration_fixture_spec.js
+++ b/core/test/unit/migration_fixture_spec.js
@@ -1018,6 +1018,7 @@ describe('Fixtures', function () {
                             serverTimezoneOffset = -60;
                             migrationsSettingsValue = '{}';
 
+                            // stub for checkIfMigrationAlreadyRan
                             sandbox.stub(models.Settings.prototype, 'fetch', function () {
                                 // CASE: we update migrations settings entry
                                 if (this.get('key') === 'migrations') {
@@ -1028,14 +1029,6 @@ describe('Fixtures', function () {
                                 return Promise.resolve(newModels[Number(this.get('key'))]);
                             });
 
-                            sandbox.stub(models.Base.Model.prototype, 'save', function (data) {
-                                if (data.key !== 'migrations') {
-                                    should.exist(data.created_at);
-                                }
-
-                                return Promise.resolve({});
-                            });
-
                             _.each(['Post', 'User', 'Subscriber', 'Settings', 'Role', 'Permission', 'Tag', 'App', 'AppSetting', 'AppField', 'Client'], function (modelType) {
                                 sandbox.stub(models[modelType], 'findAll', function () {
                                     var model = models[modelType].forge();