From 15b4791e544e0f124947e3850442c780db167ab4 Mon Sep 17 00:00:00 2001 From: John O'Nolan Date: Tue, 26 Aug 2014 13:08:43 +0300 Subject: [PATCH 1/2] Fix up user profile --- core/client/templates/settings/users/user.hbs | 158 +++++++++--------- 1 file changed, 77 insertions(+), 81 deletions(-) diff --git a/core/client/templates/settings/users/user.hbs b/core/client/templates/settings/users/user.hbs index 4bb78beca5..7e17f51eab 100644 --- a/core/client/templates/settings/users/user.hbs +++ b/core/client/templates/settings/users/user.hbs @@ -20,103 +20,99 @@ -
+
+ +
- + -
+ \ No newline at end of file From 5e126dfcd9755935a288401e8d8d14dbb928d3b9 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Tue, 26 Aug 2014 12:18:00 +0100 Subject: [PATCH 2/2] Fixing settings tests --- core/test/functional/client/settings_test.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/core/test/functional/client/settings_test.js b/core/test/functional/client/settings_test.js index 7a4f1d4862..ec29544547 100644 --- a/core/test/functional/client/settings_test.js +++ b/core/test/functional/client/settings_test.js @@ -299,7 +299,7 @@ CasperTest.begin('User settings screen resets all whitespace slug to original va }, false); }); - casper.thenClick('.content.settings-user'); + casper.thenClick('body'); casper.then(function checkSlugInputValue() { casper.wait(250); @@ -323,7 +323,7 @@ CasperTest.begin('User settings screen change slug handles duplicate slug', 4, f }, false); }); - casper.thenClick('.content.settings-user'); + casper.thenClick('body'); casper.waitForResource(/\/slugs\/user\//, function testGoodResponse(resource) { test.assert(400 > resource.status); @@ -408,11 +408,11 @@ CasperTest.begin('Ensure user bio field length validation', 3, function suite(te test.assertUrlMatch(/ghost\/settings\/users\/test-user\/$/, 'Ghost doesn\'t require login this time'); }); - casper.waitForSelector('.settings-content .settings-user', function then() { + casper.then(function setBioToInvalid() { this.fillSelectors('form.user-profile', { '#user-bio': new Array(202).join('a') }); - }, casper.failOnTimeout(test, 'waitForSelector .settings-content .settings-user timed out')); + }); casper.thenClick('.page-actions .btn-blue'); @@ -427,11 +427,11 @@ CasperTest.begin('Ensure user url field validation', 3, function suite(test) { test.assertUrlMatch(/ghost\/settings\/users\/test-user\/$/, 'Ghost doesn\'t require login this time'); }); - casper.waitForSelector('.settings-content .settings-user', function then() { + casper.then(function setWebsiteToInvalid() { this.fillSelectors('form.user-profile', { '#user-website': 'notaurl' }); - }, casper.failOnTimeout(test, 'waitForSelector .settings-content .settings-user timed out')); + }); casper.thenClick('.page-actions .btn-blue'); @@ -446,11 +446,11 @@ CasperTest.begin('Ensure user location field length validation', 3, function sui test.assertUrlMatch(/ghost\/settings\/users\/test-user\/$/, 'Ghost doesn\'t require login this time'); }); - casper.waitForSelector('.settings-content .settings-user', function then() { + casper.then(function setLocationToInvalid() { this.fillSelectors('form.user-profile', { '#user-location': new Array(1002).join('a') }); - }, casper.failOnTimeout(test, 'waitForSelector .settings-content .settings-user timed out')); + }); casper.thenClick('.page-actions .btn-blue');