From 3548ca1584a3812174939d388f25379e741b8cb9 Mon Sep 17 00:00:00 2001
From: Diana Shkolnikov <diana@mapzen.com>
Date: Fri, 26 Jun 2015 09:02:48 -0400
Subject: [PATCH] Revert "Add acceptance tests to travis-ci scripts"

---
 .travis.yml               | 11 +----------
 package.json              |  4 +---
 test/acceptance/remote.sh | 24 ------------------------
 3 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 test/acceptance/remote.sh

diff --git a/.travis.yml b/.travis.yml
index 5e0a6679..82ec939c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,4 @@
 language: node_js
-script:
-  - npm run unit
-  - >
-    if [ "${TRAVIS_BRANCH}" == "production" ]; then
-      npm run acceptance-prod;
-    fi;
-  - >
-    if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
-      npm run acceptance-stage;
-    fi;
+script: "npm run unit"
 node_js:
   - "0.10"
\ No newline at end of file
diff --git a/package.json b/package.json
index 377c750a..4c4c3411 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,7 @@
     "ciao": "node node_modules/ciao/bin/ciao -c test/ciao.json test/ciao",
     "coverage": "node_modules/.bin/istanbul cover test/unit/run.js",
     "audit": "npm shrinkwrap; node node_modules/nsp/bin/nspCLI.js audit-shrinkwrap; rm npm-shrinkwrap.json;",
-    "docs": "rm -r docs; cd test/ciao; node ../../node_modules/ciao/bin/ciao -c ../ciao.json . -d ../../docs",
-    "acceptance-prod": "sh test/acceptance/remote.sh production",
-    "acceptance-stage": "sh test/acceptance/remote.sh master"
+    "docs": "rm -r docs; cd test/ciao; node ../../node_modules/ciao/bin/ciao -c ../ciao.json . -d ../../docs"
   },
   "repository": {
     "type": "git",
diff --git a/test/acceptance/remote.sh b/test/acceptance/remote.sh
deleted file mode 100644
index c31db69a..00000000
--- a/test/acceptance/remote.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-if [ -d test/acceptance/acceptance-tests ]; then
-  rm -rf test/acceptance/acceptance-tests
-fi
-
-if [ "$1" == "production" ]; then
-  git clone -b production --single-branch https://github.com/pelias/acceptance-tests.git test/acceptance/acceptance-tests
-else
-  git clone https://github.com/pelias/acceptance-tests.git test/acceptance/acceptance-tests
-fi
-
-cd test/acceptance/acceptance-tests
-npm install
-
-if [ "$1" == "production" ]; then
-  node test -e prod
-else
-  node test -e stage
-fi
-
-cd ../../../ && rm -rf test/acceptance/acceptance-tests