From 4e637530df4528142256bde518795ec3dcdb7b15 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 7 Jun 2016 14:45:58 +0200 Subject: [PATCH] launch dev server for testing on travis --- .travis.yml | 10 ++++++++++ .../habitrpg/android/habitica/api/BaseAPITests.java | 2 -- .../habitrpg/android/habitica/api/TaskAPITests.java | 8 ++++++++ .../habitrpg/android/habitica/api/UserAPITests.java | 8 ++++++++ build.gradle | 2 +- habitica.properties.travis | 2 ++ 6 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 habitica.properties.travis diff --git a/.travis.yml b/.travis.yml index 678714f62..a91f4e2c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,16 @@ jdk: oraclejdk8 before_install: - export JAVA7_HOME=/usr/lib/jvm/java-7-oracle - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle + - cp habitica.properties.travis habitica.properties + - npm i -g npm@3 + - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 + - echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | + sudo tee /etc/apt/sources.list.d/mongodb.list + - sudo apt-get update + - sudo apt-get install mongodb-org-server + - git clone https://github.com/HabitRPG/habitrpg.git ../habitrpg + - until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 1; done + - cd ../habitrpg && cp config.json.example config.json && npm install && cd - android: components: diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java index 1ca2c4cb3..f7bd4b07a 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/BaseAPITests.java @@ -22,8 +22,6 @@ import java.util.UUID; import rx.observers.TestSubscriber; -@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.LOLLIPOP) -@RunWith(RobolectricGradleTestRunner.class) public class BaseAPITests { public APIHelper apiHelper; diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java index ca3534d60..6b557846e 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/TaskAPITests.java @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.api; +import com.habitrpg.android.habitica.BuildConfig; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; @@ -8,6 +9,11 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; import org.hamcrest.CoreMatchers; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.annotation.Config; + +import android.os.Build; import java.util.ArrayList; import java.util.List; @@ -19,6 +25,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.LOLLIPOP) +@RunWith(RobolectricGradleTestRunner.class) public class TaskAPITests extends BaseAPITests { private Task habit1; diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java index 5a6688262..7b3d394a9 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.api; +import com.habitrpg.android.habitica.BuildConfig; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; @@ -8,6 +9,11 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; import junit.framework.Assert; import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.annotation.Config; + +import android.os.Build; import java.util.UUID; @@ -16,6 +22,8 @@ import rx.observers.TestSubscriber; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotSame; +@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.LOLLIPOP) +@RunWith(RobolectricGradleTestRunner.class) public class UserAPITests extends BaseAPITests { @Test diff --git a/build.gradle b/build.gradle index e29ab9323..2ca638a10 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.1.2' classpath 'com.android.databinding:dataBinder:1.0-rc4' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' } diff --git a/habitica.properties.travis b/habitica.properties.travis new file mode 100644 index 000000000..04673d89f --- /dev/null +++ b/habitica.properties.travis @@ -0,0 +1,2 @@ +PORT=3000 +BASE_URL=http://localhost:3000