Skip to content

Commit 691a2f1

Browse files
committed
Updates: function name used for getting the current phase
1 parent 87966ac commit 691a2f1

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackFeatureRemovalPhaseHelper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class JetpackFeatureRemovalPhaseHelper @Inject constructor(
3434
private val jetpackFeatureRemovalPhaseFourConfig: JetpackFeatureRemovalPhaseFourConfig,
3535
private val jetpackFeatureRemovalNewUsersConfig: JetpackFeatureRemovalNewUsersConfig
3636
) {
37-
fun getTheCurrentPhase(): JetpackFeatureRemovalPhase? {
37+
fun getCurrentPhase(): JetpackFeatureRemovalPhase? {
3838
return if (buildConfigWrapper.isJetpackApp) null
3939
else if (jetpackFeatureRemovalNewUsersConfig.isEnabled()) PhaseNewUsers
4040
else if (jetpackFeatureRemovalPhaseFourConfig.isEnabled()) PhaseFour
@@ -45,7 +45,7 @@ class JetpackFeatureRemovalPhaseHelper @Inject constructor(
4545
}
4646

4747
fun getSiteCreationPhase(): JetpackFeatureRemovalSiteCreationPhase? {
48-
val currentPhase = getTheCurrentPhase() ?: return null
48+
val currentPhase = getCurrentPhase() ?: return null
4949
return when (currentPhase) {
5050
is PhaseOne, PhaseTwo, PhaseThree -> PHASE_ONE
5151
is PhaseFour, PhaseNewUsers -> PHASE_TWO

WordPress/src/test/java/org/wordpress/android/ui/jetpackoverlay/JetpackFeatureRemovalPhaseHelperTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class JetpackFeatureRemovalPhaseHelperTest {
5555
fun `given jetpack app, when current phase is fetched, then return null`() {
5656
whenever(buildConfigWrapper.isJetpackApp).thenReturn(true)
5757

58-
val currentPhase = jetpackFeatureRemovalPhaseHelper.getTheCurrentPhase()
58+
val currentPhase = jetpackFeatureRemovalPhaseHelper.getCurrentPhase()
5959

6060
assertNull(currentPhase)
6161
}
@@ -64,7 +64,7 @@ class JetpackFeatureRemovalPhaseHelperTest {
6464
fun `given phase one config true, when current phase is fetched, then return phase one`() {
6565
whenever(jetpackFeatureRemovalPhaseOneConfig.isEnabled()).thenReturn(true)
6666

67-
val currentPhase = jetpackFeatureRemovalPhaseHelper.getTheCurrentPhase()
67+
val currentPhase = jetpackFeatureRemovalPhaseHelper.getCurrentPhase()
6868

6969
assertEquals(currentPhase, PhaseOne)
7070
}
@@ -73,7 +73,7 @@ class JetpackFeatureRemovalPhaseHelperTest {
7373
fun `given phase two config true, when current phase is fetched, then return phase two`() {
7474
whenever(jetpackFeatureRemovalPhaseTwoConfig.isEnabled()).thenReturn(true)
7575

76-
val currentPhase = jetpackFeatureRemovalPhaseHelper.getTheCurrentPhase()
76+
val currentPhase = jetpackFeatureRemovalPhaseHelper.getCurrentPhase()
7777

7878
assertEquals(currentPhase, PhaseTwo)
7979
}
@@ -82,7 +82,7 @@ class JetpackFeatureRemovalPhaseHelperTest {
8282
fun `given phase three config true, when current phase is fetched, then return phase three`() {
8383
whenever(jetpackFeatureRemovalPhaseThreeConfig.isEnabled()).thenReturn(true)
8484

85-
val currentPhase = jetpackFeatureRemovalPhaseHelper.getTheCurrentPhase()
85+
val currentPhase = jetpackFeatureRemovalPhaseHelper.getCurrentPhase()
8686

8787
assertEquals(currentPhase, PhaseThree)
8888
}
@@ -91,7 +91,7 @@ class JetpackFeatureRemovalPhaseHelperTest {
9191
fun `given phase four config true, when current phase is fetched, then return phase four`() {
9292
whenever(jetpackFeatureRemovalPhaseFourConfig.isEnabled()).thenReturn(true)
9393

94-
val currentPhase = jetpackFeatureRemovalPhaseHelper.getTheCurrentPhase()
94+
val currentPhase = jetpackFeatureRemovalPhaseHelper.getCurrentPhase()
9595

9696
assertEquals(currentPhase, PhaseFour)
9797
}
@@ -100,7 +100,7 @@ class JetpackFeatureRemovalPhaseHelperTest {
100100
fun `given phase new users config true, when current phase is fetched, then return phase new users`() {
101101
whenever(jetpackFeatureRemovalNewUsersConfig.isEnabled()).thenReturn(true)
102102

103-
val currentPhase = jetpackFeatureRemovalPhaseHelper.getTheCurrentPhase()
103+
val currentPhase = jetpackFeatureRemovalPhaseHelper.getCurrentPhase()
104104

105105
assertEquals(currentPhase, PhaseNewUsers)
106106
}

0 commit comments

Comments
 (0)