properly render errors from adapter

code-corps · Nov 13, 2016 · a6837da · a6837da
1 parent 2502eb0
commit a6837da
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/app/components/error-formatter.js b/app/components/error-formatter.js
@@ -21,6 +21,7 @@ const { Component, computed, Object, String } = Ember;
 
 export default Component.extend({
   classNames: ['error-formatter'],
+  error: null,
 
   /**
     The default error message if the error has no other messages

diff --git a/app/templates/components/donation/donation-container.hbs b/app/templates/components/donation/donation-container.hbs
@@ -16,10 +16,11 @@
 {{/if}}
 
 {{#if canAddCard}}
-  {{#donation/credit-card canSubmit=canSubmitAddCard submit=addCard canCancel=canShowCardList}}
-    {{!can be used to show errors}}
-    {{yield}}
-  {{/donation/credit-card}}
+  {{donation/credit-card canSubmit=canSubmitAddCard submit=addCard canCancel=canShowCardList}}
+{{/if}}
+
+{{#if responseError}}
+  {{error-formatter error=responseError}}
 {{/if}}
 
 {{#if canDonate}}

diff --git a/app/templates/project/donate.hbs b/app/templates/project/donate.hbs
@@ -1,13 +1,10 @@
 {{project-header project=project}}
-{{#donation/donation-container
+{{donation/donation-container
   addCard=(action 'addCard')
   cards=user.stripeCards
   donate=(action 'donate' amount)
   donationAmount=amount
   isAddingCard=isAddingCard
   projectTitle=project.title
+  responseError=error
 }}
-  {{#if error}}
-    {{error-formatter error=error}}
-  {{/if}}
-{{/donation/donation-container}}
diff --git a/tests/acceptance/project-donate-test.js b/tests/acceptance/project-donate-test.js
@@ -215,7 +215,7 @@ test('Shows validation errors when creating subscription fails', function(assert
       });
     });
     projectDonatePage.cardList.cards(0).clickCard();
-    projectDonatePage.cardList.clickDonate();
+    projectDonatePage.clickDonate();
   });
 
   andThen(() => {