Skip to content

Commit

Permalink
Merge pull request #679 from kiwiupover/get-tests-passing
Browse files Browse the repository at this point in the history
Get tests passing again by testing against ember-data@3.8.0 instead of master

Co-authored-by: Robert Jackson <rjackson@linkedin.com>
  • Loading branch information
rwjblue and rwjblue committed Apr 11, 2019
2 parents 43ffc65 + 4408b5e commit ba9e689
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 7 deletions.
29 changes: 29 additions & 0 deletions .vscode/launch.json
@@ -0,0 +1,29 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Mocha Tests",
"program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
"args": [
"-u",
"tdd",
"--timeout",
"999999",
"--colors",
"${workspaceFolder}/test"
],
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "node",
"request": "launch",
"name": "Launch Program",
"program": "${workspaceFolder}/serve"
}
]
}
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -47,7 +47,7 @@
"co": "^4.6.0",
"ember-ajax": "^3.1.0",
"ember-cli": "~3.3.0",
"ember-cli-addon-tests": "^0.11.0",
"ember-cli-addon-tests": "^0.11.1",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-eslint": "^4.2.3",
"ember-cli-htmlbars": "^3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions test/package-json-test.js
Expand Up @@ -278,8 +278,8 @@ describe('generating package.json', function() {

function addFastBootDeps(app) {
return app.editPackageJSON(pkg => {
pkg['devDependencies']['fake-addon'] = '*';
pkg['devDependencies']['fake-addon-2'] = '*';
pkg['devDependencies']['fake-addon'] = `*`;
pkg['devDependencies']['fake-addon-2'] = `*`;
pkg['fastbootDependencies'] = ["rsvp"];
pkg['dependencies'] = {
rsvp: '3.2.1',
Expand Down
10 changes: 6 additions & 4 deletions yarn.lock
Expand Up @@ -2637,15 +2637,16 @@ ember-ajax@^3.1.0:
dependencies:
ember-cli-babel "^6.6.0"

ember-cli-addon-tests@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/ember-cli-addon-tests/-/ember-cli-addon-tests-0.11.0.tgz#7f5a07ce91317b9b06c792274e6d6a2cc43f1ee9"
ember-cli-addon-tests@^0.11.1:
version "0.11.1"
resolved "https://registry.yarnpkg.com/ember-cli-addon-tests/-/ember-cli-addon-tests-0.11.1.tgz#70c9164cb4126b2d17bbf9588ff34d97d4bfbad1"
integrity sha512-PI3ht9NrgfAwBgh3aPCVecajndvDKltTqRdtxt5bgfQJ3+AMs6moXhijKygwuAeT5btyhhLbceTfHRL/K8pX2w==
dependencies:
chalk "^2.0.1"
debug "^3.0.0"
denodeify "^1.2.1"
findup-sync "^2.0.0"
fs-extra "^4.0.2"
fs-extra "^5.0.0"
lodash "^4.0.0"
semver "^5.3.0"
symlink-or-copy "^1.1.3"
Expand Down Expand Up @@ -5276,6 +5277,7 @@ mute-stream@0.0.7:
najax@^1.0.2:
version "1.0.4"
resolved "https://registry.yarnpkg.com/najax/-/najax-1.0.4.tgz#63fd8dbf15d18f24dc895b3a16fec66c136b8084"
integrity sha512-wsSacA+RkgY1wxRxXCT3tdqzmamEv9PLeoV/ub9SlLf2RngbPMSqc3A7H35XJDfURC0twMmZsnPdsYPkuuFSVg==
dependencies:
jquery-deferred "^0.3.0"
lodash.defaultsdeep "^4.6.0"
Expand Down

0 comments on commit ba9e689

Please sign in to comment.