upgrade to 2.15 #243
Merged
upgrade to 2.15 #243
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sbatson5
force-pushed
the
upgrade-2.15
branch
4 times, most recently
from
e395887
to
126161e
Compare
|
@Dhaulagiri Think I could get a review? This PR should fix our failing tests and we are back to being green on every version in our |
sbatson5
commented
Sep 18, 2017
| ); | ||
| }); | ||
| }); | ||
| later(() => { |
There was a problem hiding this comment.
Rather than trying to be clever and use sinon to control the time, we'll just force it with later. It makes the test take a second longer to run, but we can get rid of sinon and this better matches the actual behavior.
sbatson5
force-pushed
the
upgrade-2.15
branch
from
126161e
to
9703f2a
Compare
Dhaulagiri
reviewed
Sep 19, 2017
package.json
Outdated
| @@ -25,32 +25,31 @@ | |||
| ], | |||
| "license": "MIT", | |||
| "dependencies": { | |||
| "bower": "^1.8.2", | |||
There was a problem hiding this comment.
i think this should go in devdeps since this is only to get ember try working, right?
package.json
Outdated
| }, | ||
| "devDependencies": { | ||
| "broccoli-asset-rev": "^2.4.5", | ||
| "ember-ajax": "3.0.0", | ||
| "ember-cli": "^2.14.1", | ||
| "ember-ajax": "^3.0.0", |
There was a problem hiding this comment.
i think we could actually remove ember-ajax entirely here? it's part of the default blueprint but I don't think we are using it are we?
sbatson5
force-pushed
the
upgrade-2.15
branch
from
9703f2a
to
42c9633
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's in this PR?
sinonfor stubbing methodscloses: #242