Merge pull request #192 from ember-learn/fixing-testing

Fixing testing

.travis.yml

@@ -22,6 +22,8 @@ env:
 
 branches:
   only:
+    # test the PRS to website-redesign-rfc
+    - website-redesign-rfc
     - master
     # npm version tags
     - /^v\d+\.\d+\.\d+/
@@ -44,8 +46,7 @@ jobs:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
     - stage: "Additional Tests"
-      env: EMBER_TRY_SCENARIO=ember-lts-2.18
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.4
+      env: EMBER_TRY_SCENARIO=ember-lts-3.4
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary

README.md

@@ -7,7 +7,7 @@ This addon is intended to provide basic components for easier style coordination
 Compatibility
 ------------------------------------------------------------------------------
 
-* Ember.js v2.18 or above
+* Ember.js v3.4 or above
 * Ember CLI v2.13 or above
 * Node.js v8 or above
 

addon/components/es-button.js

@@ -2,4 +2,19 @@ import Component from 'sparkles-component';
 
 export default class EsButton extends Component {
 
+  constructor({ onClicked }) {
+    super(...arguments);
+
+    if(!onClicked) {
+      // eslint-disable-next-line no-console
+      console.warn(new Error('Button created with no onClicked'));
+      this.onClicked = function() {};
+    } else {
+      this.onClicked = onClicked;
+    }
+  }
+
+  buttonClicked() {
+    this.onClicked();
+  }
 }

addon/templates/components/es-button.hbs

@@ -1,6 +1,7 @@
 <button
-  class="es-button {{if @isLight 'button-light'}} {{if @isTiny 'button-tiny'}} {{if @isBlock 'button-block'}}"
+  class="es-button {{if @isLight "button-light"}} {{if @isTiny "button-tiny"}} {{if @isBlock "button-block"}}"
   aria-label={{@label}}
+  onclick={{action this.buttonClicked}}
   ...attributes
 >
   {{#if hasBlock}}

addon/templates/components/es-header.hbs

@@ -1,3 +1,3 @@
-<header class="es-header" ...attributes>
+<header class="es-header" role="banner" ...attributes>
   {{yield}}
 </header>

addon/templates/components/es-note.hbs

@@ -1,6 +1,6 @@
 <div class="cta-note">
   <div class="cta-note-body">
-    <div class="cta-note-heading">{{nameTitle}}</div>
+    <div class="cta-note-heading hide-in-percy">{{nameTitle}}</div>
     <div class="cta-note-message">
       {{#if hasBlock}}
         {{yield}}
@@ -9,5 +9,5 @@
       {{/if}}
     </div>
   </div>
-  <img src={{imageUrl}} role="presentation" alt="Ember Mascot">
+  <img src={{imageUrl}} role="presentation" alt="Ember Mascot" class="hide-in-percy">
 </div>

addon/templates/components/es-page-header.hbs

@@ -2,7 +2,7 @@
   <div class="container">
     <h1 class="large">{{@headline}}</h1>
 
-    <p class="{{if hasBlock 'margin-bottom-small'}}">{{@detail}}</p>
+    <p class={{if hasBlock "margin-bottom-small"}}>{{@detail}}</p>
 
     {{yield}}
   </div>

config/ember-try.js

@@ -10,18 +10,6 @@ module.exports = function() {
   ]).then((urls) => {
     return {
       scenarios: [
-        {
-          name: 'ember-lts-2.18',
-          env: {
-            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
-          },
-          npm: {
-            devDependencies: {
-              '@ember/jquery': '^0.5.1',
-              'ember-source': '~2.18.0'
-            }
-          }
-        },
         {
           name: 'ember-lts-3.4',
           npm: {