From 3d6457ba1f6b7567e0d585d2e27bed1f05ca7642 Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Mon, 28 Nov 2016 20:52:49 -0800 Subject: [PATCH] Rename to thank-you; update BEM; update tests --- app/components/thank-you-container.js | 9 +++ app/components/thankyou-container.js | 17 ------ app/controllers/project/donate.js | 2 +- app/router.js | 2 +- .../project/{thankyou.js => thank-you.js} | 0 app/styles/app.scss | 2 +- app/styles/templates/project/thank-you.scss | 29 ++++++++++ app/styles/templates/project/thankyou.scss | 27 --------- .../components/thank-you-container.hbs | 10 ++++ .../components/thankyou-container.hbs | 4 -- app/templates/project/thank-you.hbs | 2 + app/templates/project/thankyou.hbs | 2 - .../assets/images/icons/fireworks-large.png | Bin 0 -> 6819 bytes .../images/icons/fireworks-large@2x.png | Bin 0 -> 14402 bytes tests/acceptance/project-donate-test.js | 2 +- tests/acceptance/project-thank-you-test.js | 49 +++++++++++++++++ tests/acceptance/project-thankyou-test.js | 52 ------------------ .../components/thank-you-container-test.js | 25 +++++++++ .../components/thankyou-container-test.js | 36 ------------ ...ou-container.js => thank-you-container.js} | 10 ++-- tests/pages/project/thank-you.js | 8 +++ tests/pages/project/thankyou.js | 12 ---- tests/unit/routes/project/thankyou-test.js | 10 ---- 23 files changed, 142 insertions(+), 168 deletions(-) create mode 100644 app/components/thank-you-container.js delete mode 100644 app/components/thankyou-container.js rename app/routes/project/{thankyou.js => thank-you.js} (100%) create mode 100644 app/styles/templates/project/thank-you.scss delete mode 100644 app/styles/templates/project/thankyou.scss create mode 100644 app/templates/components/thank-you-container.hbs delete mode 100644 app/templates/components/thankyou-container.hbs create mode 100644 app/templates/project/thank-you.hbs delete mode 100644 app/templates/project/thankyou.hbs create mode 100644 public/assets/images/icons/fireworks-large.png create mode 100644 public/assets/images/icons/fireworks-large@2x.png create mode 100644 tests/acceptance/project-thank-you-test.js delete mode 100644 tests/acceptance/project-thankyou-test.js create mode 100644 tests/integration/components/thank-you-container-test.js delete mode 100644 tests/integration/components/thankyou-container-test.js rename tests/pages/components/{thankyou-container.js => thank-you-container.js} (54%) create mode 100644 tests/pages/project/thank-you.js delete mode 100644 tests/pages/project/thankyou.js delete mode 100644 tests/unit/routes/project/thankyou-test.js diff --git a/app/components/thank-you-container.js b/app/components/thank-you-container.js new file mode 100644 index 000000000..5b5c9d24e --- /dev/null +++ b/app/components/thank-you-container.js @@ -0,0 +1,9 @@ +import Ember from 'ember'; + +const { + Component +} = Ember; + +export default Component.extend({ + classNames: ['thank-you-container'] +}); diff --git a/app/components/thankyou-container.js b/app/components/thankyou-container.js deleted file mode 100644 index bfe24556a..000000000 --- a/app/components/thankyou-container.js +++ /dev/null @@ -1,17 +0,0 @@ -import Ember from 'ember'; - -const { - Component, - computed, - get -} = Ember; - -export default Component.extend({ - classNames: ['thankyou-container'], - - projectIconAltText: computed('project.title', function() { - let projectTitle = get(this, 'project.title'); - - return `Successfully donated to ${projectTitle}`; - }) -}); diff --git a/app/controllers/project/donate.js b/app/controllers/project/donate.js index 05508a766..c94443ca3 100644 --- a/app/controllers/project/donate.js +++ b/app/controllers/project/donate.js @@ -96,7 +96,7 @@ export default Controller.extend({ _transitionToThankYou() { let project = get(this, 'project'); - return this.transitionToRoute('project.thankyou', project); + return this.transitionToRoute('project.thank-you', project); }, _handleError(error) { diff --git a/app/router.js b/app/router.js index d69dc6864..5642a3709 100644 --- a/app/router.js +++ b/app/router.js @@ -57,7 +57,7 @@ AppRouter.map(function() { this.route('task', { path: '/:number' }); }); this.route('donate'); - this.route('thankyou'); + this.route('thank-you'); }); this.route('projects', { diff --git a/app/routes/project/thankyou.js b/app/routes/project/thank-you.js similarity index 100% rename from app/routes/project/thankyou.js rename to app/routes/project/thank-you.js diff --git a/app/styles/app.scss b/app/styles/app.scss index 76e3fbae1..ad46df950 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -83,7 +83,7 @@ @import "templates/about"; @import "templates/oauth-stripe"; @import "templates/project/index"; -@import "templates/project/thankyou"; +@import "templates/project/thank-you"; @import "templates/project/settings/contributors"; @import "templates/start/expertise"; @import "templates/start/hello"; diff --git a/app/styles/templates/project/thank-you.scss b/app/styles/templates/project/thank-you.scss new file mode 100644 index 000000000..c56f20110 --- /dev/null +++ b/app/styles/templates/project/thank-you.scss @@ -0,0 +1,29 @@ +.thank-you-container { + margin: 3em; + text-align: center; + + &__project-icon { + $file: "/assets/images/icons/fireworks-large"; + $height: 100px; + $width: 100px; + @include background-image-retina($file, "png", $height, $width); + display: block; + height: $height; + margin: 1.4em auto; + width: $width; + } + + h3 { + font-size: $header-font-size-large; + font-weight: 600; + margin: 10px 0; + } + + p { + margin-bottom: 1.4em; + } + + &__message { + color: $light-text; + } +} diff --git a/app/styles/templates/project/thankyou.scss b/app/styles/templates/project/thankyou.scss deleted file mode 100644 index 9da2ea1f9..000000000 --- a/app/styles/templates/project/thankyou.scss +++ /dev/null @@ -1,27 +0,0 @@ -.thankyou-container { - .icon, .header, .text, .project-link { - width: 100%; - text-align: center; - } - - .header, .text { - margin-bottom: 20px; - } - - .header { - font-size: 1.5em; - margin-top: 0px; - } - - .icon { - img { - display: inline-block; - } - margin-bottom: 0px; - } - - .text { - color: $light-text; - font-size: 14px; - } -} diff --git a/app/templates/components/thank-you-container.hbs b/app/templates/components/thank-you-container.hbs new file mode 100644 index 000000000..d6d26f8aa --- /dev/null +++ b/app/templates/components/thank-you-container.hbs @@ -0,0 +1,10 @@ +
+

Thank you!

+
+

+ From all the volunteers on the {{project.title}} team. +

+

+ {{link-to "Back to project" "project" project.organization.slug project.slug}} +

+
diff --git a/app/templates/components/thankyou-container.hbs b/app/templates/components/thankyou-container.hbs deleted file mode 100644 index b508d65d9..000000000 --- a/app/templates/components/thankyou-container.hbs +++ /dev/null @@ -1,4 +0,0 @@ -
{{projectIconAltText}}
-

Thank you!

-
From all the volunteers on the {{project.title}} team.
-
{{#link-to "project" project}}Back to project{{/link-to}}
diff --git a/app/templates/project/thank-you.hbs b/app/templates/project/thank-you.hbs new file mode 100644 index 000000000..d88b26c2c --- /dev/null +++ b/app/templates/project/thank-you.hbs @@ -0,0 +1,2 @@ +{{project-header project=model}} +{{thank-you-container project=model}} diff --git a/app/templates/project/thankyou.hbs b/app/templates/project/thankyou.hbs deleted file mode 100644 index 60974a3ce..000000000 --- a/app/templates/project/thankyou.hbs +++ /dev/null @@ -1,2 +0,0 @@ -{{project-header project=model}} -{{thankyou-container project=model}} diff --git a/public/assets/images/icons/fireworks-large.png b/public/assets/images/icons/fireworks-large.png new file mode 100644 index 0000000000000000000000000000000000000000..63b940b42702324a14384669dfe281365943b8bf GIT binary patch literal 6819 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

y4es*ce4CDFkqwhweLKUI!#n$^NCFa6iIy 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 literal 0 HcmV?d00001 diff --git a/tests/acceptance/project-donate-test.js b/tests/acceptance/project-donate-test.js index a2aa47e3a..a4bb0ee02 100644 --- a/tests/acceptance/project-donate-test.js +++ b/tests/acceptance/project-donate-test.js @@ -128,7 +128,7 @@ test('Allows adding a card and donating (creating a subscription)', function(ass assert.ok(subscription, 'Subscription was created sucessfully.'); assert.equal(subscription.userId, user.id, 'User was set to current user.'); assert.equal(subscription.projectId, project.id, 'Project was set to current project.'); - assert.equal(currentRouteName(), 'project.thankyou', 'User was redirected to the thank you route.'); + assert.equal(currentRouteName(), 'project.thank-you', 'User was redirected to the thank you route.'); }); }); diff --git a/tests/acceptance/project-thank-you-test.js b/tests/acceptance/project-thank-you-test.js new file mode 100644 index 000000000..b06d81927 --- /dev/null +++ b/tests/acceptance/project-thank-you-test.js @@ -0,0 +1,49 @@ +import { test } from 'qunit'; +import moduleForAcceptance from 'code-corps-ember/tests/helpers/module-for-acceptance'; + +import { authenticateSession } from 'code-corps-ember/tests/helpers/ember-simple-auth'; +import createProjectWithSluggedRoute from 'code-corps-ember/tests/helpers/mirage/create-project-with-slugged-route'; +import projectThankYouPage from '../pages/project/thank-you'; + +moduleForAcceptance('Acceptance | Project - thank-you'); + +test('It requires authentication', function(assert) { + assert.expect(1); + + let project = createProjectWithSluggedRoute(); + let { organization } = project; + + projectThankYouPage.visit({ + organization: organization.slug, + project: project.slug + }); + + andThen(() => { + assert.equal(currentRouteName(), 'login'); + }); +}); + +test('It directs you to the project when done', function(assert) { + assert.expect(2); + + let user = server.create('user'); + authenticateSession(this.application, { 'user_id': user.id }); + + let project = createProjectWithSluggedRoute(); + let { organization } = project; + + projectThankYouPage.visit({ + organization: organization.slug, + project: project.slug + }); + + andThen(() => { + assert.ok(projectThankYouPage.thankYouContainer.isVisible, 'The thank you container component renders.'); + + projectThankYouPage.thankYouContainer.clickLink(); + }); + + andThen(() => { + assert.equal(currentRouteName(), 'project.index', 'Link leads to project page.'); + }); +}); diff --git a/tests/acceptance/project-thankyou-test.js b/tests/acceptance/project-thankyou-test.js deleted file mode 100644 index 6cc8535c2..000000000 --- a/tests/acceptance/project-thankyou-test.js +++ /dev/null @@ -1,52 +0,0 @@ -import { test } from 'qunit'; -import moduleForAcceptance from 'code-corps-ember/tests/helpers/module-for-acceptance'; - -import { authenticateSession } from 'code-corps-ember/tests/helpers/ember-simple-auth'; -import createOrganizationWithSluggedRoute from 'code-corps-ember/tests/helpers/mirage/create-organization-with-slugged-route'; -import projectThankYouPage from '../pages/project/thankyou'; - -moduleForAcceptance('Acceptance | Project - ThankYou'); - -test('It requires authentication', function(assert) { - assert.expect(1); - - let organization = createOrganizationWithSluggedRoute(); - let project = server.create('project', { organization }); - - projectThankYouPage.visit({ - organization: organization.slug, - project: project.slug - }); - - andThen(() => { - assert.equal(currentRouteName(), 'login'); - }); -}); - -test('It renders project header', function(assert) { - assert.expect(5); - - let user = server.create('user'); - authenticateSession(this.application, { 'user_id': user.id }); - - let organization = createOrganizationWithSluggedRoute(); - let project = server.create('project', { organization }); - - projectThankYouPage.visit({ - organization: organization.slug, - project: project.slug - }); - - andThen(() => { - assert.ok(projectThankYouPage.rendersProjectHeader, 'Project header is rendered on the page.'); - assert.ok(projectThankYouPage.rendersIcon, 'The success icon is rendered on the page.'); - assert.ok(projectThankYouPage.rendersThankYouHeader, 'A thank you header is rendered on the page.'); - assert.ok(projectThankYouPage.rendersText, 'A descriptive text is rendered on the page.'); - - projectThankYouPage.clickProjectLink(); - }); - - andThen(() => { - assert.equal(currentRouteName(), 'project.index', 'Link leads to project page.'); - }); -}); diff --git a/tests/integration/components/thank-you-container-test.js b/tests/integration/components/thank-you-container-test.js new file mode 100644 index 000000000..b61214b7d --- /dev/null +++ b/tests/integration/components/thank-you-container-test.js @@ -0,0 +1,25 @@ +import { moduleForComponent, test } from 'ember-qunit'; +import hbs from 'htmlbars-inline-precompile'; +import PageObject from 'ember-cli-page-object'; +import thankYouContainerComponent from '../../pages/components/thank-you-container'; + +let page = PageObject.create(thankYouContainerComponent); + +moduleForComponent('thank-you-container', 'Integration | Component | thank-you container', { + integration: true, + beforeEach() { + this.set('project', { + id: 42, + title: 'A Test Project' + }); + + page.setContext(this); + page.render(hbs`{{thank-you-container project=project}}`); + } +}); + +test('it renders the thank you text', function(assert) { + assert.expect(1); + + assert.equal(page.thankYouText, `From all the volunteers on the ${this.get('project.title')} team.`); +}); diff --git a/tests/integration/components/thankyou-container-test.js b/tests/integration/components/thankyou-container-test.js deleted file mode 100644 index c34272d0f..000000000 --- a/tests/integration/components/thankyou-container-test.js +++ /dev/null @@ -1,36 +0,0 @@ -import { moduleForComponent, test } from 'ember-qunit'; -import hbs from 'htmlbars-inline-precompile'; -import PageObject from 'ember-cli-page-object'; -import thankyouContainerComponent from '../../pages/components/thankyou-container'; - -let page = PageObject.create(thankyouContainerComponent); - -moduleForComponent('thankyou-container', 'Integration | Component | thankyou container', { - integration: true, - beforeEach() { - this.set('project', { - id: 42, - title: 'A Test Project', - iconLargeUrl: 'http://fillmurray.com/500/500' - }); - - page.setContext(this); - page.render(hbs`{{thankyou-container project=project}}`); - } -}); - -test('it sets the project icon alt attribute', function(assert) { - assert.expect(1); - assert.equal(page.icon.alt, 'Successfully donated to A Test Project'); -}); - -test('it sets the project icon src attribute', function(assert) { - assert.expect(1); - assert.equal(page.icon.src, this.get('project.iconLargeUrl')); -}); - -test('it renders the thank you text', function(assert) { - assert.expect(1); - - assert.equal(page.thankYouText, `From all the volunteers on the ${this.get('project.title')} team.`); -}); diff --git a/tests/pages/components/thankyou-container.js b/tests/pages/components/thank-you-container.js similarity index 54% rename from tests/pages/components/thankyou-container.js rename to tests/pages/components/thank-you-container.js index 13830dd00..1ec8b32c6 100644 --- a/tests/pages/components/thankyou-container.js +++ b/tests/pages/components/thank-you-container.js @@ -1,14 +1,16 @@ import { - attribute, + clickable, text } from 'ember-cli-page-object'; export default { + scope: '.thank-you-container', + icon: { - scope: '[data-test-selector="project icon"]', - alt: attribute('alt'), - src: attribute('src') + scope: '[data-test-selector="project icon"]' }, + clickLink: clickable('a'), + thankYouText: text('[data-test-selector="thank you message"]') }; diff --git a/tests/pages/project/thank-you.js b/tests/pages/project/thank-you.js new file mode 100644 index 000000000..4100b937d --- /dev/null +++ b/tests/pages/project/thank-you.js @@ -0,0 +1,8 @@ +import { create, visitable } from 'ember-cli-page-object'; +import thankYouContainer from 'code-corps-ember/tests/pages/components/thank-you-container'; + +export default create({ + visit: visitable(':organization/:project/thank-you'), + + thankYouContainer +}); diff --git a/tests/pages/project/thankyou.js b/tests/pages/project/thankyou.js deleted file mode 100644 index 2bc076ac5..000000000 --- a/tests/pages/project/thankyou.js +++ /dev/null @@ -1,12 +0,0 @@ -import { clickable, create, isVisible, visitable } from 'ember-cli-page-object'; - -export default create({ - visit: visitable(':organization/:project/thankyou'), - - clickProjectLink: clickable('.project-link a'), - - rendersProjectHeader: isVisible('.project-header'), - rendersIcon: isVisible('.icon img'), - rendersThankYouHeader: isVisible('.header'), - rendersText: isVisible('.text') -}); diff --git a/tests/unit/routes/project/thankyou-test.js b/tests/unit/routes/project/thankyou-test.js deleted file mode 100644 index 2279468af..000000000 --- a/tests/unit/routes/project/thankyou-test.js +++ /dev/null @@ -1,10 +0,0 @@ -import { moduleFor, test } from 'ember-qunit'; - -moduleFor('route:project/thankyou', 'Unit | Route | project/thankyou', { - needs: ['service:metrics'] -}); - -test('it exists', function(assert) { - let route = this.subject(); - assert.ok(route); -});