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

Fix tests execution #1

Merged
merged 3 commits into from
Mar 9, 2019
Merged

Fix tests execution #1

merged 3 commits into from
Mar 9, 2019

Conversation

dcyriller
Copy link

This should fix the tests for emberjs#5900

Details can be found in the commit messages.

There seems to be some issues in the yarn.lock

To solve them I ran:
- `git checkout master yarn.lock`
- `yarn`
@NullVoxPopuli NullVoxPopuli merged commit ec317ae into NullVoxPopuli:rebase-tchack-use-fetch Mar 9, 2019
runspired pushed a commit that referenced this pull request Mar 9, 2019
* Fix lint error

* Fix `_requireBuildPackages` error

* Reset yarn.lock from master

There seems to be some issues in the yarn.lock

To solve them I ran:
- `git checkout master yarn.lock`
- `yarn`
runspired pushed a commit that referenced this pull request Mar 9, 2019
* Fix lint error

* Fix `_requireBuildPackages` error

* Reset yarn.lock from master

There seems to be some issues in the yarn.lock

To solve them I ran:
- `git checkout master yarn.lock`
- `yarn`

Throw an error in case of dependency mismatch (#2)

* Throw an error in case of dependency mismatch

An app (or addon) that consumes ember-data should have:
- either jquery
- or ember-fetch version 6.0.0 or above

Throw a build error if it's not the case.

* Remove ember-fetch as a peerDependency

Move ember-fetch to dependencies (#3)

Indeed, two `ember-fetch`'s modules are imported in rest-adapter.
NullVoxPopuli pushed a commit that referenced this pull request Apr 13, 2019
* Fix lint error

* Fix `_requireBuildPackages` error

* Reset yarn.lock from master

There seems to be some issues in the yarn.lock

To solve them I ran:
- `git checkout master yarn.lock`
- `yarn`

Throw an error in case of dependency mismatch (#2)

* Throw an error in case of dependency mismatch

An app (or addon) that consumes ember-data should have:
- either jquery
- or ember-fetch version 6.0.0 or above

Throw a build error if it's not the case.

* Remove ember-fetch as a peerDependency

Move ember-fetch to dependencies (#3)

Indeed, two `ember-fetch`'s modules are imported in rest-adapter.
@dcyriller dcyriller deleted the fix-fetch-ci branch August 28, 2019 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants