add support for replacing with string #10
Merged
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
ramybenaroya
requested changes
Feb 25, 2018
index.js
Outdated
| strings[key] = startMarker + fs.readFileSync(contentFilePath) + endMarker; | ||
| } else if(content.string && typeof content.string === 'string') { | ||
| strings[key] = content.string; |
There was a problem hiding this comment.
You are missing the markers here. change line to:
strings[key] = startMarker + content.string + endMarker;This causes the following failure: https://travis-ci.org/ramybenaroya/ember-index/jobs/345734590#L986
tests/dummy/config/environment.js
Outdated
| }, { | ||
| key: 'coloring-script', | ||
| file: '_emberIndexContent/coloring-script.txt', | ||
| includeInOutput: false, | ||
| includeInIndexHtml: true | ||
| }], | ||
| },], |
tests/unit/addon-tree-test-node.js
Outdated
|
|
||
| contentFor = addon.contentFor('ember-index-4'); | ||
|
|
||
| expect(contentFor).to.be.equal(addon._startMarkerPrefix + '-3' + '<!-- content from string -->' + addon._endMarkerPrefix + '-3'); |
There was a problem hiding this comment.
You have a typo( -3 instead of -4). change the line to:
expect(contentFor).to.be.equal(addon._startMarkerPrefix + '-4' + '<!-- content from string -->' + addon._endMarkerPrefix + '-4');
|
Thank you for this PR. The tests are currently failing. Please check my requests for changes so it will pass. |
|
Done. Tests are failing for default and beta scenarios (they just hang forever). I guess it's because addon's ember-cli needs to be updated? |
|
Thanks. I'll rerun the master build and check that. |
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.
This adds the support for replacing the marker with a simple string instead of a file content as requested here #9