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

Update libs/mocks subtree with WPiOS updates #10040

Merged
merged 4 commits into from
Jun 17, 2019
Merged

Update libs/mocks subtree with WPiOS updates #10040

merged 4 commits into from
Jun 17, 2019

Conversation

jtreanor
Copy link
Contributor

@jtreanor jtreanor commented Jun 13, 2019

Now that WPiOS uses the same mocks as in libs/mocks (see wordpress-mobile/WordPress-iOS#11788), we can pull those changes back in here as a subtree.

This is a very large diff but almost all of it has all been reviewed already. The vast majority of the changes are from wordpress-mobile/WordPressMocks#3.

The only unreviewed changed are in this commit: 0c1ba96

To test:

  • Run the UI tests and confirm they still pass as exptected.

Update release notes:

  • If there are user facing changes, I have added an item to RELEASE-NOTES.txt.

@jtreanor jtreanor added this to the 12.7 milestone Jun 13, 2019
@jtreanor jtreanor requested a review from JavonDavis June 13, 2019 14:19
@peril-wordpress-mobile
Copy link

Warnings
⚠️ PR has more than 500 lines of code changing. Consider splitting into smaller PRs if possible.

Generated by 🚫 dangerJS

Copy link
Contributor

@JavonDavis JavonDavis left a comment

Choose a reason for hiding this comment

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

@jtreanor The tests seem to be failing for me... The publish test fails with the following output

com.github.tomakehurst.wiremock.client.VerificationException: 12 requests were unmatched by any stub mapping. Shown with closest stub mappings:
expected:<
GET
/rest/v1.1/sites/158396482/media/?number=48&mime_type=image%2F&locale=en_US

Query: media_type = image
Query: number = 1
> but was:<
GET
/rest/v1.1/sites/158396482/media/?number=48&mime_type=image%2F&locale=en_US


number: 48
>

expected:<
GET
/rest/v1.1/sites/158396482/media/?number=48&mime_type=image%2F&locale=en_US

Query: number = 100
> but was:<
GET
/rest/v1.1/sites/158396482/media/?number=48&mime_type=image%2F&locale=en_US

number: 48
>

expected:<
GET
/rest/v1.1/sites/158396482/media/151/
> but was:<
GET
/rest/v1.1/sites/158396482/media/?number=48&mime_type=image%2F&locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/media/?number=48&locale=en_US

Query: media_type = image
Query: number = 1
> but was:<
GET
/rest/v1.1/sites/158396482/media/?number=48&locale=en_US


number: 48
>

expected:<
GET
/rest/v1.1/sites/158396482/media/?number=48&locale=en_US

Query: number = 100
> but was:<
GET
/rest/v1.1/sites/158396482/media/?number=48&locale=en_US

number: 48
>

expected:<
GET
/rest/v1.1/sites/158396482/media/151/
> but was:<
GET
/rest/v1.1/sites/158396482/media/?number=48&locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/media/151/
> but was:<
GET
/rest/v1.1/sites/158396482/media/62/?locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/tags
> but was:<
GET
/rest/v1.1/sites/158396482/media/62/?locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/settings
> but was:<
GET
/rest/v1.1/sites/158396482/media/62/?locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/media/151/
> but was:<
GET
/rest/v1.1/sites/158396482/media/62/?locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/tags
> but was:<
GET
/rest/v1.1/sites/158396482/media/62/?locale=en_US
>

expected:<
GET
/rest/v1.1/sites/158396482/settings
> but was:<
GET
/rest/v1.1/sites/158396482/media/62/?locale=en_US
>
at com.github.tomakehurst.wiremock.junit.WireMockRule.checkForUnmatchedRequests(WireMockRule.java:92)
at com.github.tomakehurst.wiremock.junit.WireMockRule.access$000(WireMockRule.java:34)
at com.github.tomakehurst.wiremock.junit.WireMockRule$1.evaluate(WireMockRule.java:74)
at org.junit.rules.RunRules.evaluate(RunRules.java:20)
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runners.Suite.runChild(Suite.java:128)
at org.junit.runners.Suite.runChild(Suite.java:27)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
at org.junit.runner.JUnitCore.run(JUnitCore.java:137)
at org.junit.runner.JUnitCore.run(JUnitCore.java:115)
at androidx.test.internal.runner.TestExecutor.execute(TestExecutor.java:56)
at androidx.test.runner.AndroidJUnitRunner.onStart(AndroidJUnitRunner.java:388)
at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:2145)

The magic link login also fails on this screen,

Screen Shot 2019-06-14 at 11 35 03 AM

I'll continue looking at it but let me know if I'm missing something here

@jtreanor
Copy link
Contributor Author

Thanks @JavonDavis! Those errors should have been fixed by 0c1ba96 🤔

If its still broken with the latest changes to the branch, let me know!

Copy link
Contributor

@JavonDavis JavonDavis left a comment

Choose a reason for hiding this comment

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

After I pulled your latest changes and deleted the app, all the tests pass now. From the looks of it I think we're good to go now 👍

@jtreanor jtreanor merged commit e1f80d5 into develop Jun 17, 2019
@jtreanor jtreanor deleted the update-mocks branch June 17, 2019 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants