Merge branch 'master' into MOB-4190-version-3.4.4

Author: roninopf

app/src/androidTest/java/com/iterable/iterableapi/MainActivityTest.java

@@ -22,6 +22,7 @@
 import org.json.JSONObject;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -128,6 +129,7 @@ public void checkIfMessageShownAsActivity() throws Exception {
         intended(hasComponent(IterableInboxMessageActivity.class.getName()));
     }
 
+    @Ignore ("Ignoring tests needing to find webView through forceJavascriptEnabled()")
     @Test
     public void checkIfMessageShownAsPopUpForImproperIntent() throws Exception {
         JSONObject payload = new JSONObject(IterableTestUtils.getResourceString("editable_get_messages_response.json"));
@@ -149,6 +151,7 @@ public void checkIfMessageShownAsPopUpForImproperIntent() throws Exception {
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 
+    @Ignore ("Ignoring tests needing to find webView through forceJavascriptEnabled()")
     @Test
     public void checkIfMessageShownAsPopUpForUnexpectedIntent() throws Exception {
         JSONObject payload = new JSONObject(IterableTestUtils.getResourceString("editable_get_messages_response.json"));
@@ -170,6 +173,7 @@ public void checkIfMessageShownAsPopUpForUnexpectedIntent() throws Exception {
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 
+    @Ignore ("Ignoring tests needing to find webView through forceJavascriptEnabled()")
     @Test
     public void checkIfMessageShownAsPopUpForNoIntent() throws Exception {
         JSONObject payload = new JSONObject(IterableTestUtils.getResourceString("editable_get_messages_response.json"));
@@ -188,6 +192,7 @@ public void checkIfMessageShownAsPopUpForNoIntent() throws Exception {
         onWebView().withElement(findElement(Locator.XPATH, "//*[contains(text(),'Ok, got it')]"));
     }
 
+    @Ignore ("Ignoring tests needing to find webView through forceJavascriptEnabled()")
     @Test
     public void checkIfMessageShownAsPopUp() throws Exception {
         JSONObject payload = new JSONObject(IterableTestUtils.getResourceString("editable_get_messages_response.json"));

iterableapi/src/test/java/com/iterable/iterableapi/IterableInAppManagerTest.java

@@ -16,6 +16,7 @@
 import org.json.JSONObject;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.invocation.InvocationOnMock;
@@ -89,6 +90,7 @@ public void tearDown() throws IOException {
         IterableActivityMonitor.instance = new IterableActivityMonitor();
     }
 
+    @Ignore("Ignoring due to stalling")
     @Test
     public void testDoNotShowMultipleTimes() throws Exception {
         ActivityController<FragmentActivity> controller = Robolectric.buildActivity(FragmentActivity.class).create().start().resume();
@@ -102,6 +104,7 @@ public void testDoNotShowMultipleTimes() throws Exception {
         controller.pause().stop().destroy();
     }
 
+    @Ignore("Ignoring due to stalling")
     @Test
     public void testIfDialogDoesNotDestroysAfterConfigurationChange() throws Exception {
         ActivityController<FragmentActivity> controller = Robolectric.buildActivity(FragmentActivity.class).create().start().resume();
@@ -115,6 +118,7 @@ public void testIfDialogDoesNotDestroysAfterConfigurationChange() throws Excepti
         controller.pause().stop().destroy();
     }
 
+    @Ignore("Ignoring due to stalling")
     @Test
     public void testIfDialogFragmentExistAfterRotation() throws Exception {
         ActivityController controller = Robolectric.buildActivity(FragmentActivity.class).create().start().resume();