Skip to content

Commit

Permalink
Merge pull request #3 from pzuraq/bugfix/add-is-descriptor
Browse files Browse the repository at this point in the history
[BUGFIX] Adds the isDescriptor flag
  • Loading branch information
pzuraq authored Apr 6, 2019
2 parents be74206 + 88cef18 commit 61b0846
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "6"
- '6'

sudo: false
dist: trusty
Expand Down Expand Up @@ -34,24 +34,25 @@ jobs:
include:
# runs linting and tests with current locked deps

- stage: "Tests"
name: "Tests"
- stage: 'Tests'
name: 'Tests'
install:
- yarn install --non-interactive
script:
- yarn lint:hbs
- yarn lint:js
- yarn test

- name: "Floating Dependencies"
- name: 'Floating Dependencies'
script:
- yarn test

# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- stage: "Additional Tests"
- 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.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
Empty file removed app/.gitkeep
Empty file.
8 changes: 8 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ module.exports = function() {
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
}
}
},
{
name: 'ember-release',
npm: {
Expand Down
2 changes: 2 additions & 0 deletions vendor/ember-decorators-polyfill/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,8 @@ import {
}
}

DecoratorDescriptor.prototype.isDescriptor = true;

function computedDecorator(fn, params) {
let dec = function(prototype, key, desc) {
assert(
Expand Down

0 comments on commit 61b0846

Please sign in to comment.