Skip to content

fix(prepare): disregard app_resources's dir name when preparing in platforms/ #3403

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

Merged
merged 1 commit into from
Mar 5, 2018

Conversation

petekanev
Copy link
Contributor

patches #3356

addresses #3400 and #3401

@petekanev petekanev requested a review from KristianDD February 28, 2018 11:06
@KristianDD KristianDD force-pushed the kddimitrov/nsconfig-app-folder branch from b96a8cc to 2b5ef94 Compare February 28, 2018 12:01
@petekanev petekanev changed the base branch from kddimitrov/nsconfig-app-folder to master March 1, 2018 13:16
@petekanev petekanev force-pushed the pete/nsconfig-app-folder-patch1 branch 2 times, most recently from a944442 to 3faf66e Compare March 1, 2018 15:07
@petekanev petekanev force-pushed the pete/nsconfig-app-folder-patch1 branch from 3faf66e to d7b244a Compare March 2, 2018 13:28
@petekanev petekanev changed the title fix(prepare): consider app_resources's dir name when preparing in platforms/ fix(prepare): disregard app_resources's dir name when preparing in platforms/ Mar 2, 2018
@petekanev
Copy link
Contributor Author

@KristianDD please review

@petekanev petekanev force-pushed the pete/nsconfig-app-folder-patch1 branch from d7b244a to 883fa4a Compare March 5, 2018 08:22
@petekanev
Copy link
Contributor Author

run ci

app_resources dir path. This should align the names in platforms/android
across the board and prevent having to do additional checks which could
report false positives for the presence of app_resources when the name of
the directory is too generic.
@petekanev petekanev force-pushed the pete/nsconfig-app-folder-patch1 branch from 883fa4a to 6f94b78 Compare March 5, 2018 13:57
@petekanev petekanev merged commit 97d72e9 into master Mar 5, 2018
@petekanev petekanev deleted the pete/nsconfig-app-folder-patch1 branch March 5, 2018 14:46
@@ -71,7 +71,7 @@ describe("App files copy", () => {

it("copies all app files but app_resources when not bundling", () => {
const updater = new CopyAppFilesUpdater([
"file1", "dir1/file2", "App_Resources/Android/blah.png"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed? If the behavior is changed, the testname and expected results should be changed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rosen-vladimirov that's an oversight on my part. I changed the only failing test, because the app_resources were no longer filtered as part of the copy() method but in public updateApp() which returns void and I found no straightforward way of mocking it in order to update the test properly.

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.

3 participants