Skip to content

Commit

Permalink
Merge pull request #11689 from wordpress-mobile/issue/11683-pr-fix-un…
Browse files Browse the repository at this point in the history
…it-test-conflict-in-develop

Fixing unit testing conflict not detected by github during merge.
  • Loading branch information
malinajirka authored Apr 17, 2020
2 parents d96ed07 + 3cb8fe5 commit d534adf
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,13 @@ class FeaturedImageHelperTest {
eq("https://testing.com/url.jpg"),
anyInt(),
anyInt(),
anyBoolean(),
anyBoolean()
)
}

@Test
fun `createCurrent-State returns uses thumbnailUrl is not empty`() {
fun `createCurrent-State uses thumbnailUrl if it is not empty`() {
// Arrange
val post: PostImmutableModel = mock()
whenever(post.hasFeaturedImage()).thenReturn(true)
Expand All @@ -343,6 +344,7 @@ class FeaturedImageHelperTest {
"https://testing.com/thumbnail.jpg"),
anyInt(),
anyInt(),
anyBoolean(),
anyBoolean()
)
}
Expand Down

0 comments on commit d534adf

Please sign in to comment.