From a92090ebb22b064bc76944b154656cbced9aafa2 Mon Sep 17 00:00:00 2001
From: arekkas <aeneas@ory.am>
Date: Fri, 18 May 2018 17:07:07 +0200
Subject: [PATCH] e2e

---
 .circleci/.travis.yml | 56 -------------------------------------------
 .circleci/config.yml  |  1 +
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 .circleci/.travis.yml

diff --git a/.circleci/.travis.yml b/.circleci/.travis.yml
deleted file mode 100644
index 2c20f81972..0000000000
--- a/.circleci/.travis.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-sudo: required
-
-language: go
-
-go:
-  - 1.9
-
-go_import_path: github.com/ory/hydra
-
-services:
-  - docker
-
-env:
-  - DOCKER_BIND_LOCALHOST=true DATABASE_URL=memory DEP_VERSION="0.3.2"
-
-before_install:
-  - curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
-  - chmod +x $GOPATH/bin/dep
-  - sudo apt-get install curl
-
-install:
-  - go get -u github.com/go-swagger/go-swagger/cmd/swagger github.com/bradfitz/goimports github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/mitchellh/gox github.com/ory/go-acc
-  - git clone https://github.com/docker-library/official-images.git ~/official-images
-  - dep ensure
-  - go install github.com/ory/hydra
-
-script:
-  - ./scripts/test-format.sh
-  - go-acc -o coverage.txt ./...
-  - go test -race -short $(go list ./... | grep -v cmd)
-  - docker build -t hydra-travis-ci -f Dockerfile-without-telemetry .
-  - docker run -d hydra-travis-ci
-  - DATABASE_URL=memory hydra host --dangerous-auto-logon --dangerous-force-http --disable-telemetry &
-  - while ! echo exit | nc localhost 4444; do sleep 1; done
-  - ./scripts/test-e2e.sh
-  - ./scripts/run-genswag.sh
-  - goveralls -service=travis-ci -coverprofile=coverage.txt
-
-after_success:
-  - ./scripts/run-deploy.sh
-
-deploy:
-  - provider: npm
-    api_key: "$NPM_TOKEN"
-    email: "$NPM_EMAIL"
-    skip_cleanup: true
-    on:
-      tags: true
-  - provider: releases
-    file_glob: true
-    api_key: "$GITHUB_TOKEN"
-    file: "dist/*"
-    skip_cleanup: true
-    on:
-      tags: true
-      go: 1.9
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3a9e3bf0ad..69f5c35532 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,6 +35,7 @@ jobs:
       - run: go get -u github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
       - run: dep ensure -vendor-only
       - run: go install github.com/ory/hydra
+      - run: go install github.com/ory/hydra/test/mock-lcp
       - run: go-acc -o coverage.txt ./...
       - run: go test -race -short $(go list ./... | grep -v cmd)
       - run: ./scripts/test-e2e.sh