epistemophiliac/frappe_docker
1
0
Fork 0
mirror of https://github.com/frappe/frappe_docker.git synced 2026-06-26 09:05:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

#1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer

Browse source
This commit is contained in:
Varun 2023-10-26 10:45:08 +11:00
parent ad4c2fac22
commit 8a94a45120
4 changed files with 110 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
devcontainer-example/docker-compose.yml
View file

@ -39,31 +39,33 @@ services:
ports:
- 8000-8005:8000-8005
- 9000-9005:9000-9005
ui-tester:
# pass custom command to start Cypress otherwise it will use the entrypoint
# specified in the Cypress Docker image.
# also pass "--project <folder>" so that when Cypress opens
# it can find file "cypress.json" and show integration specs
# https://on.cypress.io/command-line#cypress-open
entrypoint: 'sleep infinity'
image: "docker.io/cypress/included:latest"
#command: sleep infinity
environment:
- SHELL=/bin/bash
# get the IP address of the host machine and allow X11 to accept
# incoming connections from that IP address
# IP=$(ipconfig getifaddr en0) or mac or \
# IP=$($(hostname -I | awk '{print $1}') ) for Ubuntu
# /usr/X11/bin/xhost + $IP
# then pass the environment variable DISPLAY to show Cypress GUI on the host system
# DISPLAY=$IP:0
- DISPLAY
volumes:
# for Cypress to communicate with the X11 server pass this socket file
# in addition to any other mapped volumes
- /tmp/.X11-unix:/tmp/.X11-unix
- ..:/workspace:z,cached
network_mode: "host"
# enable the below service if you need Cypress UI Tests to be executed
# Before enabling ensure install_x11_deps.sh has been executed and display variable is exported.
# Run install_x11_deps.sh again if DISPLAY is not set
# ui-tester:
# # pass custom command to start Cypress otherwise it will use the entrypoint
# # specified in the Cypress Docker image.
# # also pass "--project <folder>" so that when Cypress opens
# # it can find file "cypress.json" and show integration specs
# # https://on.cypress.io/command-line#cypress-open
# entrypoint: 'sleep infinity'
# image: "docker.io/cypress/included:latest"
# environment:
# - SHELL=/bin/bash
# # get the IP address of the host machine and allow X11 to accept
# # incoming connections from that IP address
# # IP=$(ipconfig getifaddr en0) or mac or \
# # IP=$($(hostname -I | awk '{print $1}') ) for Ubuntu
# # /usr/X11/bin/xhost + $IP
# # then pass the environment variable DISPLAY to show Cypress GUI on the host system
# # DISPLAY=$IP:0
# - DISPLAY
# volumes:
# # for Cypress to communicate with the X11 server pass this socket file
# # in addition to any other mapped volumes
# - /tmp/.X11-unix:/tmp/.X11-unix
# - ..:/workspace:z,cached
# network_mode: "host"
volumes:
mariadb-data:
#postgresql-data:

5
development/installer.py
View file

@ -106,6 +106,7 @@ def get_args_parser():
default="admin",
)
parser.add_argument(
"-d",
"--db-type",
action="store",
type=str,
@ -119,7 +120,6 @@ def init_bench_if_not_exist(args):
if os.path.exists(args.bench_name):
cprint("Bench already exists. Only site will be created", level=3)
return
try:
env = os.environ.copy()
if args.py_version:
@ -135,7 +135,6 @@ def init_bench_if_not_exist(args):
init_command += f"--frappe-path={args.frappe_repo} "
init_command += f"--frappe-branch={args.frappe_branch} "
init_command += f"--apps_path={args.apps_json} "
#init_command += f"--db_type={args.db_type} " #--db-type postgres
init_command += args.bench_name
print(init_command)
command = [
@ -235,9 +234,7 @@ def create_site_in_bench(args):
apps.remove("frappe")
for app in apps:
new_site_cmd.append(f"--install-app={app}")
new_site_cmd.append(args.site_name)
cprint(f"Creating Site {args.site_name} ...", level=2)
subprocess.call(
new_site_cmd,

4
docs/development.md
View file

@ -393,6 +393,7 @@ To run cypress based UI tests in a docker environment, follow the below steps:
```shell
sudo ./install_x11_deps.sh
```
This script will install required deps, enable X11Forwarding and restart SSH daemon and export `DISPLAY` variable.
2. Run X11 service `startx` or `xquartz`
@ -403,5 +404,4 @@ This script will install required deps, enable X11Forwarding and restart SSH dae
> More references : [Cypress Official Documentation](https://www.cypress.io/blog/2019/05/02/run-cypress-with-a-single-docker-command)
> Ensure DISPLAY enviroment is always exported.
> Ensure DISPLAY environment is always exported.

24
install_x11_deps.sh
View file

@ -51,29 +51,26 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
else
# Check which package manager is available
if command -v apt-get >/dev/null 2>&1; then
package_manager="apt"
install_command="sudo apt-get update && sudo apt-get install xorg openbox"
elif command -v dnf >/dev/null 2>&1; then
package_manager="dnf"
install_command="sudo dnf install xorg-x11-server-Xorg openbox"
else
echo "Error: Unable to determine the package manager. Manual installation required."
exit 1
fi
# Install X11 and Openbox based on the package manager
if [ "$package_manager" = "apt" ]; then
sudo apt-get update
sudo apt-get install xorg openbox
elif [ "$package_manager" = "dnf" ]; then
sudo dnf install xorg-x11-server-Xorg openbox
fi
# Check if X11 and Openbox were installed successfully
if [ $? -eq 0 ]; then
# Check if the installation command is defined
if [ -n "$install_command" ]; then
# Execute the installation command
if $install_command; then
echo "X11 and Openbox have been successfully installed."
else
echo "Error: Failed to install X11 and Openbox."
exit 1
fi
else
echo "Error: Unsupported package manager."
exit 1
fi
# Call the function to update X11Forwarding
@ -81,10 +78,11 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
# Get the IP address of the host dynamically
host_ip=$(hostname -I | awk '{print $1}')
xhost + $host_ip && xhost + local:
xhost + "$host_ip" && xhost + local:
# Set the DISPLAY variable to the host IP
export DISPLAY="$host_ip:0.0"
echo "DISPLAY variable set to $DISPLAY"
elif [[ "$OSTYPE" == "darwin"* ]]; then
# macOS
if command -v xquartz >/dev/null 2>&1; then