Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing testing #192

Merged
merged 10 commits into from
Jul 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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+/
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 0 additions & 12 deletions addon/components/es-blog-heading.js

This file was deleted.

15 changes: 15 additions & 0 deletions addon/components/es-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
9 changes: 0 additions & 9 deletions addon/templates/components/es-blog-heading.hbs

This file was deleted.

3 changes: 2 additions & 1 deletion addon/templates/components/es-button.hbs
Original file line number Diff line number Diff line change
@@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion addon/templates/components/es-header.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<header class="es-header" ...attributes>
<header class="es-header" role="banner" ...attributes>
{{yield}}
</header>
4 changes: 2 additions & 2 deletions addon/templates/components/es-note.hbs
Original file line number Diff line number Diff line change
@@ -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}}
Expand All @@ -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>
2 changes: 1 addition & 1 deletion addon/templates/components/es-page-header.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion app/components/es-blog-heading.js

This file was deleted.

12 changes: 0 additions & 12 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
Loading