Skip to content

Commit 4c86652

Browse files
authored
Merge branch 'develop' into issue/482-format-crash
2 parents 2d21f5f + 588b002 commit 4c86652

File tree

18 files changed

+1093
-489
lines changed

18 files changed

+1093
-489
lines changed

app/build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ android {
2222
}
2323
sourceSets {
2424
main.java.srcDirs += 'src/main/kotlin'
25+
androidTest.java.srcDirs += 'src/androidTest/kotlin'
2526
}
2627

2728
lintOptions {
@@ -46,4 +47,8 @@ dependencies {
4647
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion", {
4748
exclude group: 'com.android.support', module: 'support-annotations'
4849
}
49-
}
50+
androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2', {
51+
exclude group: 'com.android.support', module: 'support-annotations'
52+
}
53+
androidTestCompile('com.xamarin.testcloud:espresso-support:1.3')
54+
}

app/src/androidTest/java/org/wordpress/aztec/demo/SimpleTextFormattingTests.java

Lines changed: 0 additions & 271 deletions
This file was deleted.

app/src/androidTest/java/org/wordpress/aztec/demo/TestUtils.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)