-
Notifications
You must be signed in to change notification settings - Fork 19
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
Fix ui tests and create a primitive backend mock #24
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
9c80bd1
Add email code validation on registration flow
gizemb 7ab190b
Review changes
gizemb 5a891ca
Merge remote-tracking branch 'origin/master' into feature/registratio…
gizemb e00da67
Fix ui tests, mock backend calls
gizemb bad7cef
Merge remote-tracking branch 'origin/master' into feature/ui_test_mocks
gizemb File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 0 additions & 14 deletions
14
app/src/androidTest/kotlin/com/wire/android/WireApplicationTest.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
app/src/androidTest/kotlin/com/wire/android/framework/KoinMockRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
package com.wire.android.framework | ||
|
||
import org.koin.test.KoinTest | ||
import org.koin.test.mock.MockProviderRule | ||
import org.mockito.Mockito | ||
|
||
fun KoinTest.koinMockRule() = MockProviderRule.create { clazz -> Mockito.mock(clazz.java) } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
...re/android/feature/auth/registration/personal/phone/CreatePersonalAccountPhoneFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
package com.wire.android.feature.auth.registration.personal.phone | ||
|
||
import androidx.fragment.app.Fragment | ||
import com.wire.android.R | ||
|
||
class CreatePersonalAccountPhoneFragment : Fragment(R.layout.fragment_create_personal_account_phone) { | ||
companion object { | ||
fun newInstance() = CreatePersonalAccountPhoneFragment() | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,7 +14,7 @@ | |
app:layout_constraintGuide_percent="0.228" /> | ||
|
||
<androidx.appcompat.widget.AppCompatTextView | ||
android:id="@+id/createPersonalAccountTitleTextView" | ||
android:id="@+id/createPersonalAccountHeaderTextView" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. due to duplicate naming |
||
style="@style/TextView.Authentication.Header" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
|
@@ -31,7 +31,7 @@ | |
app:layout_constraintBottom_toBottomOf="parent" | ||
app:layout_constraintEnd_toEndOf="parent" | ||
app:layout_constraintStart_toStartOf="parent" | ||
app:layout_constraintTop_toBottomOf="@+id/createPersonalAccountTitleTextView" | ||
app:layout_constraintTop_toBottomOf="@+id/createPersonalAccountHeaderTextView" | ||
app:layout_constraintWidth_percent="@dimen/authentication_editable_field_width_percent"> | ||
|
||
<com.google.android.material.tabs.TabLayout | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,7 @@ | |
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:hint="@string/create_personal_account_with_email_edit_text_hint" | ||
android:imeOptions="flagNoExtractUi" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. for the weird keyboard behaviour in landscape mode. |
||
android:inputType="textEmailAddress" | ||
android:paddingEnd="@dimen/create_personal_account_text_input_layout_padding_end"> | ||
|
||
|
7 changes: 7 additions & 0 deletions
7
app/src/main/res/layout/fragment_create_personal_account_phone.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<androidx.constraintlayout.widget.ConstraintLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" | ||
android:layout_height="wrap_content"> | ||
|
||
<!-- TODO inflate views --> | ||
</androidx.constraintlayout.widget.ConstraintLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
espresso was complaining about ambiguous resources (since there were 2 instances of the same fragment). so I created this empty fragment, which will be filled soon :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add the
TODO()
then :)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a TODO in xml layout