Revert "wut"

This reverts commit 7885b95.
CircleCI-Public · Jun 24, 2018 · 328997c · 328997c
1 parent 7885b95
commit 328997c
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 636 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,21 +3,57 @@ jobs:
   build:
     docker:
       - image: circleci/python:3.6.2-stretch-browsers
+        environment:
+          FLASK_CONFIG: testing
+          TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable
+      - image: circleci/postgres:9.6.5-alpine-ram
+        environment:
+          POSTGRES_USER: ubuntu
+          POSTGRES_DB: circle_test
+          POSTGRES_PASSWORD: ""
     steps:
       - checkout
+      - run: mkdir test-reports
+      - run:
+          name: Download Selenium
+          command: |
+            curl -O http://selenium-release.storage.googleapis.com/3.5/selenium-server-standalone-3.5.3.jar
+      - run:
+          name: Start Selenium
+          command: |
+            java -jar selenium-server-standalone-3.5.3.jar -log test-reports/selenium.log
+          background: true
       - restore_cache:
-          key: -v1-{{ checksum "requirements/dev.txt" }}
+          key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }}
       - run:
           command: |
             python3 -m venv venv
             . venv/bin/activate
             pip install -r requirements/dev.txt
+      - run:
+          name: setup Heroku
+          command: bash .circleci/setup-heroku.sh
       - save_cache:
-          key: -v1-{{ checksum "requirements/dev.txt" }}
+          key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }}
           paths:
             - "venv"
       - run:
           command: |
             . venv/bin/activate
             python manage.py test
-
+      - store_artifacts:
+          path: test-reports/
+          destination: tr1
+      - store_test_results:
+          path: test-reports/
+      - add_ssh_keys:
+          fingerprints:
+            - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4"
+      - deploy:
+          name: Deploy Master to Heroku
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              git push heroku master
+              heroku run python manage.py deploy
+              heroku restart
+            fi
diff --git a/tests/sub_tests/__init__.py b/tests/sub_tests/__init__.py
diff --git a/tests/sub_tests/test_api.py b/tests/sub_tests/test_api.py
diff --git a/tests/sub_tests/test_basics.py b/tests/sub_tests/test_basics.py