From 17564d85fedd3e3205fd31a6067abe0ab5f0aee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tautvidas=20Sipavi=C4=8Dius?= <t.9b5as@gmail.com>
Date: Wed, 23 Sep 2015 14:24:24 +0300
Subject: [PATCH] Rename subject and preheader, fix tests

---
 assets/js/src/newsletter_editor/components/content.js  |  4 ++--
 assets/js/src/newsletter_editor/components/heading.js  |  4 ++--
 .../newsletter_editor/components/content.spec.js       |  4 ++--
 .../newsletter_editor/components/heading.spec.js       | 10 +++++-----
 views/newsletter/templates/components/heading.hbs      |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/assets/js/src/newsletter_editor/components/content.js b/assets/js/src/newsletter_editor/components/content.js
index 44ac22b4b7..6d9dae462b 100644
--- a/assets/js/src/newsletter_editor/components/content.js
+++ b/assets/js/src/newsletter_editor/components/content.js
@@ -62,12 +62,12 @@ define([
     App.toJSON = Module.toJSON;
     App.getNewsletter = Module.getNewsletter;
 
-    Module.newsletter = new Module.NewsletterModel(_.omit(_.clone(options.newsletter), ['data', 'styles']));
+    Module.newsletter = new Module.NewsletterModel(_.omit(_.clone(options.newsletter), ['content', 'globalStyles']));
   });
 
   App.on('start', function(options) {
     // TODO: Other newsletter information will be needed as well.
-    App._contentContainer = new (this.getBlockTypeModel('container'))(options.newsletter.data, {parse: true});
+    App._contentContainer = new (this.getBlockTypeModel('container'))(options.newsletter.content, {parse: true});
     App._contentContainerView = new (this.getBlockTypeView('container'))({
       model: App._contentContainer,
       renderOptions: { depth: 0 },
diff --git a/assets/js/src/newsletter_editor/components/heading.js b/assets/js/src/newsletter_editor/components/heading.js
index 81eae35ec7..4db3705f6f 100644
--- a/assets/js/src/newsletter_editor/components/heading.js
+++ b/assets/js/src/newsletter_editor/components/heading.js
@@ -19,8 +19,8 @@ define([
     },
     events: function() {
       return {
-        'keyup .mailpoet_input_title': _.partial(this.changeField, "newsletter_subject"),
-        'keyup .mailpoet_input_preheader': _.partial(this.changeField, "newsletter_preheader"),
+        'keyup .mailpoet_input_title': _.partial(this.changeField, "subject"),
+        'keyup .mailpoet_input_preheader': _.partial(this.changeField, "preheader"),
       };
     },
     changeField: function(field, event) {
diff --git a/tests/javascript/newsletter_editor/components/content.spec.js b/tests/javascript/newsletter_editor/components/content.spec.js
index 9b86a9de3a..145af2e1fc 100644
--- a/tests/javascript/newsletter_editor/components/content.spec.js
+++ b/tests/javascript/newsletter_editor/components/content.spec.js
@@ -50,13 +50,13 @@ define([
     });
 
     describe('transformation to json', function() {
-      it('includes data, styles and initial newsletter fields', function() {
+      it('includes content, globalStyles and initial newsletter fields', function() {
         var dataField = {
           containerModelField: 'containerModelValue',
         }, stylesField = {
           globalStylesField: 'globalStylesValue',
         }, newsletterFields = {
-          newsletter_subject: 'test newsletter subject',
+          subject: 'test newsletter subject',
         };
         EditorApplication._contentContainer = {
           toJSON: function() {
diff --git a/tests/javascript/newsletter_editor/components/heading.spec.js b/tests/javascript/newsletter_editor/components/heading.spec.js
index 1bcf155a07..560de3c317 100644
--- a/tests/javascript/newsletter_editor/components/heading.spec.js
+++ b/tests/javascript/newsletter_editor/components/heading.spec.js
@@ -8,7 +8,7 @@ define([
       var view;
       beforeEach(function() {
         var model = new Backbone.SuperModel({
-          newsletter_subject: 'a test subject',
+          subject: 'a test subject',
         });
         view = new (HeadingComponent.HeadingView)({
           model: model,
@@ -23,8 +23,8 @@ define([
         var view, model;
         beforeEach(function() {
           model = new Backbone.SuperModel({
-            newsletter_subject: 'a test subject',
-            newsletter_preheader: 'a test preheader',
+            subject: 'a test subject',
+            preheader: 'a test preheader',
           });
           view = new (HeadingComponent.HeadingView)({
             model: model,
@@ -34,12 +34,12 @@ define([
 
         it('changes the model when subject field is changed', function() {
           view.$('.mailpoet_input_title').val('a new testing subject').keyup();
-          expect(model.get('newsletter_subject')).to.equal('a new testing subject');
+          expect(model.get('subject')).to.equal('a new testing subject');
         });
 
         it('changes the model when preheader field is changed', function() {
           view.$('.mailpoet_input_preheader').val('a new testing preheader').keyup();
-          expect(model.get('newsletter_preheader')).to.equal('a new testing preheader');
+          expect(model.get('preheader')).to.equal('a new testing preheader');
         });
       });
     });
diff --git a/views/newsletter/templates/components/heading.hbs b/views/newsletter/templates/components/heading.hbs
index 798fb78d59..30fee47c29 100644
--- a/views/newsletter/templates/components/heading.hbs
+++ b/views/newsletter/templates/components/heading.hbs
@@ -1,6 +1,6 @@
 <div class="mailpoet_form_field mailpoet_heading_form_field">
-    <input type="text" class="mailpoet_input mailpoet_input_title" value="{{ model.newsletter_subject }}" placeholder="<%= __('Click to change the subject!') %>" />
+    <input type="text" class="mailpoet_input mailpoet_input_title" value="{{ model.subject }}" placeholder="<%= __('Click to change the subject!') %>" />
 </div>
 <div class="mailpoet_form_field mailpoet_heading_form_field">
-    <input type="text" class="mailpoet_input mailpoet_input_preheader" value="" placeholder="<%= __('Write your preheader here...') %>" />
+    <input type="text" class="mailpoet_input mailpoet_input_preheader" value="{{ model.preheader }}" placeholder="<%= __('Write your preheader here...') %>" />
 </div>