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.

Sign up for GitHub

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

Fixing unit testing conflict not detected by github during merge. #11689

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Fixing unit testing conflict not detected by github during merge. #11689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion WordPress/src/test/java/org/wordpress/android/ui/posts/FeaturedImageHelperTest.kt
View file
Open in desktop
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