Browse Source

fixing nvm

Daniel Zlotin 7 years ago
parent
commit
585119c8b6

+ 1
- 1
.travis.yml View File

@@ -25,8 +25,8 @@ before_cache:
25 25
   - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
26 26
 
27 27
 install:
28
-  - touch $HOME/.bash_profile
29 28
   - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
29
+  - export NVM_DIR="$HOME/.nvm" && [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
30 30
   - nvm install $NODE_VERSION
31 31
   - nvm use $NODE_VERSION
32 32
   - nvm ls

+ 11
- 10
AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java View File

@@ -13,7 +13,6 @@ import android.support.test.uiautomator.Until;
13 13
 import org.junit.After;
14 14
 import org.junit.Before;
15 15
 import org.junit.FixMethodOrder;
16
-import org.junit.Ignore;
17 16
 import org.junit.Test;
18 17
 import org.junit.runner.RunWith;
19 18
 import org.junit.runners.MethodSorters;
@@ -40,15 +39,20 @@ public class ApplicationLifecycleTest {
40 39
     }
41 40
 
42 41
     @Test
43
-    public void _1_showSplash_AcceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
42
+    public void _1_acceptsOverlayPermissions_ShowsWelcomeScreen() throws Exception {
44 43
         launchTheApp();
44
+        assertMainShown();
45
+    }
45 46
 
47
+    @Test
48
+    public void _2_showSplash() throws Exception {
49
+        launchTheApp();
50
+        assertExists(By.desc("NavigationSplashView"));
46 51
         assertMainShown();
47 52
     }
48 53
 
49 54
     @Test
50
-    @Ignore
51
-    public void _2_relaunchFromBackground() throws Exception {
55
+    public void _3_relaunchFromBackground() throws Exception {
52 56
         launchTheApp();
53 57
         assertMainShown();
54 58
         push();
@@ -62,8 +66,7 @@ public class ApplicationLifecycleTest {
62 66
     }
63 67
 
64 68
     @Test
65
-    @Ignore
66
-    public void _3_relaunchAfterClose() throws Exception {
69
+    public void _4_relaunchAfterClose() throws Exception {
67 70
         launchTheApp();
68 71
         push();
69 72
         assertPushedScreenShown();
@@ -75,8 +78,7 @@ public class ApplicationLifecycleTest {
75 78
     }
76 79
 
77 80
     @Test
78
-    @Ignore
79
-    public void _4_deviceOrientationDoesNotDestroyActivity() throws Exception {
81
+    public void _5_deviceOrientationDoesNotDestroyActivity() throws Exception {
80 82
         launchTheApp();
81 83
         push();
82 84
         assertPushedScreenShown();
@@ -88,8 +90,7 @@ public class ApplicationLifecycleTest {
88 90
     }
89 91
 
90 92
     @Test
91
-    @Ignore
92
-    public void _5_relaunchAfterActivityKilledBySystem() throws Exception {
93
+    public void _6_relaunchAfterActivityKilledBySystem() throws Exception {
93 94
         launchTheApp();
94 95
         push();
95 96
         assertPushedScreenShown();