diff options
author | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-14 18:34:09 +0200 |
---|---|---|
committer | Duda Dornelles <ddornell@thoughtworks.com> | 2014-10-14 18:34:09 +0200 |
commit | dc991ddffc287263c2b4fd218d43e2f501b181dc (patch) | |
tree | c216a03162eecb63a0a39e02e8103e048ab7afa9 | |
parent | 4ddf0754fad765eb2fd31af710de9ae03f643c8a (diff) |
Adding feature toggle for auto reload so we can disable it in the functional tests
-rw-r--r-- | service/test/support/integration_helper.py | 1 | ||||
-rw-r--r-- | web-ui/app/js/features/features.js | 3 | ||||
-rw-r--r-- | web-ui/app/js/mail_list/domain/refresher.js | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/service/test/support/integration_helper.py b/service/test/support/integration_helper.py index 326ec7cd..7b6af2e4 100644 --- a/service/test/support/integration_helper.py +++ b/service/test/support/integration_helper.py @@ -146,6 +146,7 @@ class SoledadTestBase: # setup app PixelatedMail.from_email_address = self.mail_address self.app = pixelated.user_agent.app.test_client() + pixelated.user_agent.DISABLED_FEATURES.append('autoReload') self.account = FakeAccount() self.pixelated_mailboxes = PixelatedMailBoxes(self.account) self.mail_sender = mock() diff --git a/web-ui/app/js/features/features.js b/web-ui/app/js/features/features.js index e008b5fc..1a00658d 100644 --- a/web-ui/app/js/features/features.js +++ b/web-ui/app/js/features/features.js @@ -48,6 +48,9 @@ define([], function() { isEnabled: function (featureName) { return ! _.contains(getDisabledFeatures(), featureName); }, + isAutoRefreshEnabled: function () { + return this.isEnabled('autoRefresh'); + }, isLogoutEnabled: function () { return _.has(getDispatcherFeatures(), 'logout'); }, diff --git a/web-ui/app/js/mail_list/domain/refresher.js b/web-ui/app/js/mail_list/domain/refresher.js index 6f3b1c04..38c9cde5 100644 --- a/web-ui/app/js/mail_list/domain/refresher.js +++ b/web-ui/app/js/mail_list/domain/refresher.js @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. */ -define(['flight/lib/component', 'page/events'], function(defineComponent, events) { +define(['flight/lib/component', 'page/events', 'features'], function(defineComponent, events, features) { 'use strict'; return defineComponent(refresher); @@ -34,7 +34,9 @@ define(['flight/lib/component', 'page/events'], function(defineComponent, events }; this.after('initialize', function () { - this.setupRefresher(); + if (features.isAutoRefreshEnabled()) { + this.setupRefresher(); + } }); } } |