Merge branch 'master' of github.com:mapbox/mapbox-gl-native into nightlyBuilds

10 files changed, 0 insertions, 92 deletions

diff --git a/android/scripts/common.sh b/android/scripts/common.sh
index 5c214fe256..69f41997c7 100755
--- a/android/scripts/common.sh
+++ b/android/scripts/common.sh
@@ -16,7 +16,3 @@ make android BUILDTYPE=$BUILDTYPE JOBS=$JOBS
 
 aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://mapbox-gl-testing/android/${NAME}/app-debug.apk
 aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/app-release-unsigned.apk
-
-if [[ $TESTMUNK == "yes" ]]; then
-    ./android/scripts/upload-testmunk.sh ./android/java/app/build/outputs/apk/app-debug.apk
-fi
diff --git a/android/scripts/upload-testmunk.sh b/android/scripts/upload-testmunk.sh
deleted file mode 100755
index 3fd1e70a1a..0000000000
--- a/android/scripts/upload-testmunk.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-EMAIL="leith@mapbox.com"
-APP_NAME="Mapbox"
-APK_PATH=$1
-
-echo "submitting testrun to testmunk"
-
-echo "uploading features..."
-
-zip -r android/test/features.zip android/test/features/
-RESPONSE=$(curl -f -H "Accept: application/vnd.testmunk.v1+json" -F "file=@android/test/features.zip" "https://${TESTMUNK_KEY}@api.testmunk.com/apps/${APP_NAME}/testcases")
-
-echo "uploading apk..."
-
-RESPONSE=$(curl -f -H "Accept: application/vnd.testmunk.v1+json" -F "file=@${APK_PATH}" -F "email=${EMAIL}" -F "autoStart=true" -F "public=true" "https://${TESTMUNK_KEY}@api.testmunk.com/apps/${APP_NAME}/testruns")
-
-TESTRUN_ID=$(echo "${RESPONSE}" | jq -r '.id')
-TESTRUN_NAME=$(echo "${RESPONSE}" | jq -r '.name')
-
-echo "successully uploaded to Testmunk as '${TESTRUN_NAME}'"
-echo "public link to test results: https://www.testmunk.com/testrun/${TESTRUN_ID}"
diff --git a/android/test/.gitignore b/android/test/.gitignore
deleted file mode 100644
index 68c12ecc03..0000000000
--- a/android/test/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-features.zip
diff --git a/android/test/features/load-app.feature b/android/test/features/load-app.feature
deleted file mode 100644
index e6bd1158a4..0000000000
--- a/android/test/features/load-app.feature
+++ /dev/null
@@ -1,5 +0,0 @@
-Feature: Testapp V.1.2
-
-Scenario: 1) Start app and load map
-	Given I await for 5 seconds
-
diff --git a/android/test/features/step_definitions/calabash_steps.rb b/android/test/features/step_definitions/calabash_steps.rb
deleted file mode 100755
index 6d80ff0c97..0000000000
--- a/android/test/features/step_definitions/calabash_steps.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'calabash-android/calabash_steps'
diff --git a/android/test/features/step_definitions/my_steps.rb b/android/test/features/step_definitions/my_steps.rb
deleted file mode 100644
index 3239322ddc..0000000000
--- a/android/test/features/step_definitions/my_steps.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Then /^I await for ([\d\.]+) second(?:s)?$/ do |num_seconds|
-num_seconds = num_seconds.to_f
-sleep num_seconds
-
-end
diff --git a/android/test/features/support/app_installation_hooks.rb b/android/test/features/support/app_installation_hooks.rb
deleted file mode 100755
index 2e0a203bc5..0000000000
--- a/android/test/features/support/app_installation_hooks.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'calabash-android/management/app_installation'
-
-AfterConfiguration do |config|
-	FeatureNameMemory.feature_name = nil
-end
-
-Before do |scenario|
-  @scenario_is_outline = (scenario.class == Cucumber::Ast::OutlineTable::ExampleRow)
-  if @scenario_is_outline 
-    scenario = scenario.scenario_outline 
-  end 
-
-  feature_name = scenario.feature.title
-  if FeatureNameMemory.feature_name != feature_name \
-      or ENV["RESET_BETWEEN_SCENARIOS"] == "1"
-    if ENV["RESET_BETWEEN_SCENARIOS"] == "1"
-      log "New scenario - reinstalling apps"
-    else
-      log "First scenario in feature - reinstalling apps"
-    end
-    
-    uninstall_apps
-    install_app(ENV["TEST_APP_PATH"])
-    install_app(ENV["APP_PATH"])
-    FeatureNameMemory.feature_name = feature_name
-	FeatureNameMemory.invocation = 1
-  else
-    FeatureNameMemory.invocation += 1
-  end
-end
-
-FeatureNameMemory = Class.new
-class << FeatureNameMemory
-  @feature_name = nil
-  attr_accessor :feature_name, :invocation
-end
diff --git a/android/test/features/support/app_life_cycle_hooks.rb b/android/test/features/support/app_life_cycle_hooks.rb
deleted file mode 100755
index 63d4678d9a..0000000000
--- a/android/test/features/support/app_life_cycle_hooks.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'calabash-android/management/adb'
-require 'calabash-android/operations'
-
-Before do |scenario|
-  start_test_server_in_background
-end
-
-After do |scenario|
-  if scenario.failed?
-    screenshot_embed
-  end
-  shutdown_test_server
-end
diff --git a/android/test/features/support/env.rb b/android/test/features/support/env.rb
deleted file mode 100755
index bb2505d458..0000000000
--- a/android/test/features/support/env.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'calabash-android/cucumber'
diff --git a/android/test/features/support/hooks.rb b/android/test/features/support/hooks.rb
deleted file mode 100755
index e69de29bb2..0000000000
--- a/android/test/features/support/hooks.rb
+++ /dev/null