From 7b0860e85f67a1264ba135d7b7da9ea8091d6f3c Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Thu, 2 Apr 2020 14:36:34 +0200
Subject: [PATCH] Rename test folder
---
.gitlab-ci.yml | 16 ++++++++--------
docker-compose.yml | 2 +-
.../Dockerfile | 0
.../README.md | 0
test/{login_logout => integration_tests}/app.py | 0
.../requirements.txt | 0
.../test/Dockerfile | 0
.../test/behave/features/environment.py | 0
.../test/behave/features/login.feature | 0
.../features/reject_unauthorized_logins.feature | 0
.../test/behave/features/remember_me.feature | 0
.../behave/features/steps/compare_json_values.py | 0
.../features/steps/webdriver_with_variables.py | 0
13 files changed, 9 insertions(+), 9 deletions(-)
rename test/{login_logout => integration_tests}/Dockerfile (100%)
rename test/{login_logout => integration_tests}/README.md (100%)
rename test/{login_logout => integration_tests}/app.py (100%)
rename test/{login_logout => integration_tests}/requirements.txt (100%)
rename test/{login_logout => integration_tests}/test/Dockerfile (100%)
rename test/{login_logout => integration_tests}/test/behave/features/environment.py (100%)
rename test/{login_logout => integration_tests}/test/behave/features/login.feature (100%)
rename test/{login_logout => integration_tests}/test/behave/features/reject_unauthorized_logins.feature (100%)
rename test/{login_logout => integration_tests}/test/behave/features/remember_me.feature (100%)
rename test/{login_logout => integration_tests}/test/behave/features/steps/compare_json_values.py (100%)
rename test/{login_logout => integration_tests}/test/behave/features/steps/webdriver_with_variables.py (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22e0da8..1dc9f13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,26 +29,26 @@ login_provider:
- login_provider/**/*
- .gitlab-ci.yml
-login_logout:
+integration_test_app:
stage: build-test-images
variables:
- KANIKO_CONTEXT: "test/login_logout"
+ KANIKO_CONTEXT: "test/integration_tests"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build
only:
changes:
- - ./test/login_logout/**/*
+ - ./test/integration_tests/**/*
- .gitlab-ci.yml
integration_test:
stage: build-test-images
variables:
- KANIKO_CONTEXT: "test/login_logout/test"
+ KANIKO_CONTEXT: "test/integration_tests/test"
KANIKO_BUILD_IMAGENAME: $CI_JOB_NAME
extends: .kaniko_build
only:
changes:
- - ./test/login_logout/test/**/*
+ - ./test/integration_tests/test/**/*
- .gitlab-ci.yml
@@ -71,7 +71,7 @@ behave-integration:
- http://oauth:5000/callback
- name: open.greenhost.net:4567/openappstack/user-panel/backend:master
alias: backend
- - name: ${CI_REGISTRY_IMAGE}/login_logout:${CI_COMMIT_REF_NAME}
+ - name: ${CI_REGISTRY_IMAGE}/integration_test_app:${CI_COMMIT_REF_NAME}
alias: oauth
variables:
# Feature Flag FF_NETWORK_PER_BUILD Enables creation of a docker network per build
@@ -125,7 +125,7 @@ behave-integration:
# Wait for 60s for hydra to become available. Then create the oauth2 client object
- while [[ $HYDRASTATUS -ne "200" && 60 -ge $TIMER ]]; do HYDRASTATUS=`curl http://hydra:4445/health/ready -o /dev/null -w "%{http_code}"` || TIMER=$TIMER+5 && sleep 5 ; done
- /bin/bash test/create-hydra-client.bash ${KEY} ${SECRET} http://hydra:4445 http://oauth:5000/callback
- - cd test/login_logout/test/behave/
+ - cd test/integration_tests/test/behave/
- >
python3 -m behave
-D headless=True
@@ -137,6 +137,6 @@ behave-integration:
-D role=${ROLE}
artifacts:
paths:
- - test/login_logout/test/behave/screenshots/
+ - test/integration_tests/test/behave/screenshots/
expire_in: 1 month
when: on_failure
diff --git a/docker-compose.yml b/docker-compose.yml
index 696e6b0..8ed729d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,7 +64,7 @@ services:
ports:
- "5432:5432"
oauth:
- build: ./test/login_logout
+ build: ./test/integration_tests
environment:
- BASE_URL=http://localhost:4444/
- ACCESS_TOKEN_URL=http://hydra:4444/oauth2/token
diff --git a/test/login_logout/Dockerfile b/test/integration_tests/Dockerfile
similarity index 100%
rename from test/login_logout/Dockerfile
rename to test/integration_tests/Dockerfile
diff --git a/test/login_logout/README.md b/test/integration_tests/README.md
similarity index 100%
rename from test/login_logout/README.md
rename to test/integration_tests/README.md
diff --git a/test/login_logout/app.py b/test/integration_tests/app.py
similarity index 100%
rename from test/login_logout/app.py
rename to test/integration_tests/app.py
diff --git a/test/login_logout/requirements.txt b/test/integration_tests/requirements.txt
similarity index 100%
rename from test/login_logout/requirements.txt
rename to test/integration_tests/requirements.txt
diff --git a/test/login_logout/test/Dockerfile b/test/integration_tests/test/Dockerfile
similarity index 100%
rename from test/login_logout/test/Dockerfile
rename to test/integration_tests/test/Dockerfile
diff --git a/test/login_logout/test/behave/features/environment.py b/test/integration_tests/test/behave/features/environment.py
similarity index 100%
rename from test/login_logout/test/behave/features/environment.py
rename to test/integration_tests/test/behave/features/environment.py
diff --git a/test/login_logout/test/behave/features/login.feature b/test/integration_tests/test/behave/features/login.feature
similarity index 100%
rename from test/login_logout/test/behave/features/login.feature
rename to test/integration_tests/test/behave/features/login.feature
diff --git a/test/login_logout/test/behave/features/reject_unauthorized_logins.feature b/test/integration_tests/test/behave/features/reject_unauthorized_logins.feature
similarity index 100%
rename from test/login_logout/test/behave/features/reject_unauthorized_logins.feature
rename to test/integration_tests/test/behave/features/reject_unauthorized_logins.feature
diff --git a/test/login_logout/test/behave/features/remember_me.feature b/test/integration_tests/test/behave/features/remember_me.feature
similarity index 100%
rename from test/login_logout/test/behave/features/remember_me.feature
rename to test/integration_tests/test/behave/features/remember_me.feature
diff --git a/test/login_logout/test/behave/features/steps/compare_json_values.py b/test/integration_tests/test/behave/features/steps/compare_json_values.py
similarity index 100%
rename from test/login_logout/test/behave/features/steps/compare_json_values.py
rename to test/integration_tests/test/behave/features/steps/compare_json_values.py
diff --git a/test/login_logout/test/behave/features/steps/webdriver_with_variables.py b/test/integration_tests/test/behave/features/steps/webdriver_with_variables.py
similarity index 100%
rename from test/login_logout/test/behave/features/steps/webdriver_with_variables.py
rename to test/integration_tests/test/behave/features/steps/webdriver_with_variables.py
--
GitLab