Move setup vendor permissions into make install, corrects tests

This commit is contained in:
Maxi Redigonda 2022-05-04 09:45:39 -03:00
parent 57fd123c55
commit 8092cad24c
3 changed files with 3 additions and 8 deletions

View File

@ -8,7 +8,6 @@ jobs:
- run: cd server && make build
- run: cd server && make run
- run: cd server && make install-not-interactive
- run: cd server && make setup-vendor-permissions
- run: cd server && make test-not-interactive
- run: cd tests && make build
- run: cd tests && make run-not-interactive

View File

@ -10,17 +10,13 @@ build:
@docker network create os-net || true
install:
@docker exec -it opensupports-srv bash -c "cd /var/www/html && composer install" || echo "${red}Please execute 'make run' first${reset}"
@docker exec -it opensupports-srv bash -c "cd /var/www/html && composer install && chmod 777 -R vendor/ezyang && chmod 777 -R files" || echo "${red}Please execute 'make run' first${reset}"
@docker exec -it opensupports-db bash -c "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS development;\" " || echo "${red}Please execute 'make run' first${reset}"
install-not-interactive:
@docker exec opensupports-srv bash -c "cd /var/www/html && composer install" || echo "${red}Please execute 'make run' first${reset}"
@docker exec opensupports-srv bash -c "cd /var/www/html && composer install && chmod 777 -R vendor/ezyang && chmod 777 -R files" || echo "${red}Please execute 'make run' first${reset}"
@docker exec opensupports-db bash -c "mysql -u root -e \"CREATE DATABASE IF NOT EXISTS development;\" " || echo "${red}Please execute 'make run' first${reset}"
setup-vendor-permissions:
@docker exec opensupports-srv bash -c "cd /var/www/html && chmod 777 -R vendor/ezyang" || echo "${red}Please execute 'make run' first${reset}"
@docker exec opensupports-srv bash -c "cd /var/www/html && chmod 777 -R files" || echo "${red}Please execute 'make run' first${reset}"
run: stop
@docker run --platform=linux/amd64 -d --network os-net --name opensupports-db -p 4040:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -v $(PWD)/.dbdata/:/var/lib/mysql mysql:5.6
@docker run --platform=linux/amd64 -d --network os-net --name opensupports-myadmin --link opensupports-db:db -p 6060:80 phpmyadmin/phpmyadmin

View File

@ -68,7 +68,7 @@ describe '/ticket/edit-title' do
title: 'Casterly Rock',
ticketNumber: ticket['ticket_number']
})
(result['status']).should.equal('failure hehe this is broken')
(result['status']).should.equal('fail')
(result['message']).should.equal('NO_PERMISSION')
end