Merge branch 'feature/simulate-no-network-without-airplane-mode' into develop_test

Conflicts:
	AndroidManifest.xml
	tests/src/se/leap/bitmaskclient/test/testDashboard.java

1 files changed, 5 insertions, 5 deletions

diff --git a/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java b/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java
index 55fd87ae..847d8cdd 100644
--- a/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java
+++ b/tests/src/se/leap/bitmaskclient/test/testConfigurationWizard.java
@@ -1,15 +1,14 @@
 package se.leap.bitmaskclient.test;
 
+import android.test.ActivityInstrumentationTestCase2;
+import android.widget.ListView;
+import com.jayway.android.robotium.solo.Solo;
 import java.io.IOException;
-
 import se.leap.bitmaskclient.AboutActivity;
 import se.leap.bitmaskclient.ConfigurationWizard;
 import se.leap.bitmaskclient.ProviderDetailFragment;
 import se.leap.bitmaskclient.R;
-import android.test.ActivityInstrumentationTestCase2;
-import android.widget.ListView;
-
-import com.jayway.android.robotium.solo.Solo;
+import se.leap.bitmaskclient.test.ConnectionManager;
 
 public class testConfigurationWizard extends ActivityInstrumentationTestCase2<ConfigurationWizard> {
 
@@ -24,6 +23,7 @@ public class testConfigurationWizard extends ActivityInstrumentationTestCase2<Co
 	protected void setUp() throws Exception {
 		super.setUp();
 		solo = new Solo(getInstrumentation(), getActivity());
+		ConnectionManager.setMobileDataEnabled(true, solo.getCurrentActivity().getApplicationContext());
 	}
 
 	@Override