From de63f56f68a30a5d324b17c9a4851b6d6a0a646d Mon Sep 17 00:00:00 2001 From: Jason Williams Date: Tue, 21 Oct 2014 16:02:11 +0000 Subject: [PATCH] Update Ember to 1.8.0. Closes #4316 - Ember@1.8.0. - Ember-Data@1.0.0-beta.11. - Change templates to use new Ember.Select syntax and other minor cleanup. - Adjust functional tests. --- bower.json | 4 +-- core/client/assets/sass/patterns/forms.scss | 2 +- core/client/controllers/application.js | 6 +++++ core/client/templates/-navbar.hbs | 2 +- core/client/templates/post-settings-menu.hbs | 2 +- core/client/templates/settings/general.hbs | 2 +- core/test/functional/client/editor_test.js | 6 ++--- core/test/functional/client/settings_test.js | 27 +++++++++++++++----- 8 files changed, 35 insertions(+), 16 deletions(-) diff --git a/bower.json b/bower.json index 9a930bc90d..cb1ec59c1f 100644 --- a/bower.json +++ b/bower.json @@ -4,8 +4,8 @@ "codemirror": "4.0.1", "Countable": "2.0.2", "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d", - "ember": "1.7.0", - "ember-data": "~1.0.0-beta.8", + "ember": "1.8.0", + "ember-data": "1.0.0-beta.11", "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1", "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e", "ember-simple-auth": "0.6.6", diff --git a/core/client/assets/sass/patterns/forms.scss b/core/client/assets/sass/patterns/forms.scss index 0c5ff86044..548dd09915 100644 --- a/core/client/assets/sass/patterns/forms.scss +++ b/core/client/assets/sass/patterns/forms.scss @@ -266,7 +266,7 @@ textarea { // Select Component // --- // -// {{view Ember.Select +// {{view "select" // id="activeTheme" // name="general[activeTheme]" // content=themes diff --git a/core/client/controllers/application.js b/core/client/controllers/application.js index b7692875f4..951490fd45 100644 --- a/core/client/controllers/application.js +++ b/core/client/controllers/application.js @@ -7,6 +7,12 @@ var ApplicationController = Ember.Controller.extend({ showGlobalMobileNav: false, showSettingsMenu: false, + userImageAlt: Ember.computed('session.user.name', function () { + var name = this.get('session.user.name'); + + return name + '\'s profile picture'; + }), + actions: { topNotificationChange: function (count) { this.set('topNotificationCount', count); diff --git a/core/client/templates/-navbar.hbs b/core/client/templates/-navbar.hbs index 4336dc1511..e2fc3a90f8 100644 --- a/core/client/templates/-navbar.hbs +++ b/core/client/templates/-navbar.hbs @@ -32,7 +32,7 @@
{{#gh-dropdown-button dropdownName="user-menu" tagName="div" classNames="nav-label clearfix"}} {{#if session.user.image}} -
{{session.user.name}}'s profile picture
+
userImageAlt}}
{{else}}
Profile picture
{{/if}} diff --git a/core/client/templates/post-settings-menu.hbs b/core/client/templates/post-settings-menu.hbs index a07999ef49..a8d8061f34 100644 --- a/core/client/templates/post-settings-menu.hbs +++ b/core/client/templates/post-settings-menu.hbs @@ -28,7 +28,7 @@ - {{view Ember.Select + {{view "select" name="post-setting-author" id="author-list" content=authors diff --git a/core/client/templates/settings/general.hbs b/core/client/templates/settings/general.hbs index a194d3d736..b7bbd963ec 100644 --- a/core/client/templates/settings/general.hbs +++ b/core/client/templates/settings/general.hbs @@ -72,7 +72,7 @@
- {{view Ember.Select + {{view "select" id="activeTheme" name="general[activeTheme]" content=themes diff --git a/core/test/functional/client/editor_test.js b/core/test/functional/client/editor_test.js index 208805709b..0a705dfc4e 100644 --- a/core/test/functional/client/editor_test.js +++ b/core/test/functional/client/editor_test.js @@ -39,7 +39,7 @@ CasperTest.begin('Ghost editor functions correctly', 20, function suite(test) { // Part 2: Test saving with data casper.then(function createTestPost() { - casper.sendKeys('#entry-title', testPost.title); + casper.sendKeys('#entry-title', testPost.title, {reset: true}); casper.writeContentToCodeMirror(testPost.html); }); @@ -625,7 +625,7 @@ CasperTest.begin('Title input is set correctly after using the Post-Settings-Men // add a new post casper.then(function fillContent() { - casper.sendKeys('#entry-title', 'post title'); + casper.sendKeys('#entry-title', 'post title', {reset: true}); casper.writeContentToCodeMirror('Just a bit of test text'); }); @@ -636,7 +636,7 @@ CasperTest.begin('Title input is set correctly after using the Post-Settings-Men // change the title casper.then(function updateTitle() { - casper.sendKeys('#entry-title', 'changed post title'); + casper.sendKeys('#entry-title', 'changed post title', {reset: true}); casper.click('#entry-markdown-content'); }); diff --git a/core/test/functional/client/settings_test.js b/core/test/functional/client/settings_test.js index 30aaabaf69..4364202622 100644 --- a/core/test/functional/client/settings_test.js +++ b/core/test/functional/client/settings_test.js @@ -277,9 +277,13 @@ CasperTest.begin('User settings screen resets all whitespace slug to original va test.assertUrlMatch(/ghost\/settings\/users\/test\/$/, 'Ghost doesn\'t require login this time'); }); - casper.then(function setSlugToAllWhitespace() { - slug = casper.getElementInfo('#user-slug').attributes.value; + casper.then(function getSlugValue() { + slug = this.evaluate(function () { + return document.querySelector('#user-slug').value; + }); + }); + casper.then(function changeSlugInput() { casper.fillSelectors('.user-profile', { '#user-slug': ' ' }, false); @@ -301,9 +305,13 @@ CasperTest.begin('User settings screen change slug handles duplicate slug', 4, f test.assertUrlMatch(/ghost\/settings\/users\/test\/$/, 'Ghost doesn\'t require login this time'); }); - casper.then(function changeSlug() { - slug = casper.getElementInfo('#user-slug').attributes.value; + casper.then(function getSlugValue() { + slug = this.evaluate(function () { + return document.querySelector('#user-slug').value; + }); + }); + casper.then(function changeSlug() { casper.fillSelectors('.user-profile', { '#user-slug': slug + '!' }, false); @@ -321,16 +329,21 @@ CasperTest.begin('User settings screen change slug handles duplicate slug', 4, f }); CasperTest.begin('User settings screen validates email', 6, function suite(test) { - var email, brokenEmail; + var email; casper.thenOpenAndWaitForPageLoad('settings.users.user', function testTitleAndUrl() { test.assertTitle('Ghost Admin', 'Ghost admin has no title'); test.assertUrlMatch(/ghost\/settings\/users\/test\/$/, 'Ghost doesn\'t require login this time'); }); + casper.then(function getEmail() { + email = this.evaluate(function () { + return document.querySelector('#user-email').value; + }); + }); + casper.then(function setEmailToInvalid() { - email = casper.getElementInfo('#user-email').attributes.value; - brokenEmail = email.replace('.', '-'); + var brokenEmail = email.replace('.', '-'); casper.fillSelectors('.user-profile', { '#user-email': brokenEmail