Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* <p>
* wordpress://jetpack-connection?reason={error}
* <p>
* Redirects users to the stats activity if the jetpack connection was succesful
* Redirects users to the stats activity if the jetpack connection was successful
*/
public class JetpackConnectionResultActivity extends BaseAppCompatActivity {
private static final String ALREADY_CONNECTED = "already-connected";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {

private void removeSightAndSounds() {
// on API26 we removed the Sight & Sounds category altogether, as it can always be
// overriden by the user in the Device settings, and the settings here
// overridden by the user in the Device settings, and the settings here
// wouldn't either reflect nor have any effect anyway.
PreferenceScreen preferenceScreen =
(PreferenceScreen) findPreference(getActivity().getString(R.string.wp_pref_notifications_root));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class PagesViewModel

private var _site: SiteModel? = null
val site: SiteModel
get() = checkNotNull(_site) { "Trying to access unitialized site" }
get() = checkNotNull(_site) { "Trying to access uninitialized site" }

private var _arePageActionsEnabled = true
val arePageActionsEnabled: Boolean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ResolverUtilityTest : BaseUnitTest() {
}

@Test
fun `Transaction is completed succesfully when no errors`() {
fun `Transaction is completed successfully when no errors`() {
resolverUtility.copySitesWithIndexes(sites = listOf(SiteModel(), SiteModel()))
verify(sqliteDatabase, times(1)).beginTransaction()
verify(sqliteDatabase, times(1)).setTransactionSuccessful()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class DeepLinkUriUtilsTest {
}

@Test
fun `returns null when site doesnt exist`() {
fun `returns null when site doesn't exist`() {
whenever(siteStore.getSitesByNameOrUrlMatching(host)).thenReturn(listOf())

val hostToSite = deepLinkUriUtils.hostToSite(host)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class SiteUtilsTest {
}

@Test
fun `checkMinimalJetpackVersion doesnt fail when Jetpack version is false`() {
fun `checkMinimalJetpackVersion doesn't fail when Jetpack version is false`() {
val site = SiteModel()
site.jetpackVersion = "false"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ private void setEditorProgressBarVisibility(boolean shown) {
}

public void resetUploadingMediaToFailed(Set<Integer> failedMediaIds) {
// get all media failed for this post, and represent it on tje UI
// get all media failed for this post, and represent it on the UI
if (failedMediaIds != null && !failedMediaIds.isEmpty()) {
for (Integer mediaId : failedMediaIds) {
// and keep track of failed ids around
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ class SiteRestClientTest {
}

@Test
fun `given not authenticated, when all domains are requested, then retun auth required error`() = test {
fun `given not authenticated, when all domains are requested, then return auth required error`() = test {
val tokenErrorMessage = "An active access token must be used to query information about the current user."
val error = WPComGsonNetworkError(BaseNetworkError(GenericErrorType.NOT_AUTHENTICATED, tokenErrorMessage))
initAllDomainsResponse(error = error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class ReferrersStoreTest {
}

@Test
fun `report referrer as spam doesnt mark spam when cache fails`() = test {
fun `report referrer as spam doesn't mark spam when cache fails`() = test {
val date = Date()
val restResponse = ReportReferrerAsSpamPayload(ReportReferrerAsSpamResponse(true))
whenever(restClient.reportReferrerAsSpam(site, domain)).thenReturn(restResponse)
Expand Down
2 changes: 1 addition & 1 deletion libs/mocks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The JSON files used by WireMock to handle requests and are located in `src/main/
you're first going to want to set up [Charles Proxy](https://www.charlesproxy.com/) (or similar) to work with your Android emulator.
If you've never done this I found
[this article](https://medium.com/@daptronic/the-android-emulator-and-charles-proxy-a-love-story-595c23484e02) to be a
good place to start. Once you've done that you'll want to walk through the specfic flow you're testing and store the JSON contents
good place to start. Once you've done that you'll want to walk through the specific flow you're testing and store the JSON contents
of the necessary responses in the `jsonBody` field of the `response` field in the mock file.

Here's an example of what this might look like,
Expand Down
Loading