From 1092435c7ba56e848d978d5270b5a6636790d365 Mon Sep 17 00:00:00 2001
From: Andrea Fazzi
Date: Tue, 11 Feb 2020 11:13:19 +0100
Subject: [PATCH] Completed second iteration of regression test
---
regression_test/Makefile | 6 ++++--
regression_test/regression_test.go | 6 +++++-
templates/schools_show.html.tpl | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/regression_test/Makefile b/regression_test/Makefile
index 409055f2..563ffffe 100644
--- a/regression_test/Makefile
+++ b/regression_test/Makefile
@@ -1,11 +1,13 @@
+ffmpeg_nolog = -hide_banner -loglevel panic
+
.PHONY: all
.PHONY: test
test:
- docker exec -d oef_regression_test_selenium_1 ffmpeg -y -video_size 1360x1020 -framerate 15 -f x11grab -i :99.0 /tmp/recording.mp4
+ docker exec -d oef_regression_test_selenium_1 ffmpeg -y $(ffmpeg_nolog) -video_size 1360x1020 -framerate 15 -f x11grab -i :99.0 /tmp/recording.mp4
go test
docker exec oef_regression_test_selenium_1 killall -s SIGINT ffmpeg
- docker exec oef_regression_test_selenium_1 ffmpeg -y -i /tmp/recording.mp4 -filter:v "setpts=5*PTS" /tmp/recording_slow.mp4
+ docker exec oef_regression_test_selenium_1 ffmpeg -y $(ffmpeg_nolog) -i /tmp/recording.mp4 -filter:v "setpts=5*PTS" /tmp/recording_slow.mp4
docker exec oef_regression_test_selenium_1 MP4Box -isma -inter 500 -out /tmp/recording_cleaned_up.mp4 /tmp/recording_slow.mp4
docker cp oef_regression_test_selenium_1:/tmp/recording_cleaned_up.mp4 recordings/recording.mp4
diff --git a/regression_test/regression_test.go b/regression_test/regression_test.go
index 536a96fc..2d4ae25e 100644
--- a/regression_test/regression_test.go
+++ b/regression_test/regression_test.go
@@ -217,8 +217,12 @@ func (t *testSuite) TestSchoolSubscription() {
Category: &orm.Category{Name: "Senior"},
})
+ clickPrimaryButton()
+
alert, err = findElement(".alert").Text()
- t.Nil(err)
+ if err != nil {
+ panic(err)
+ }
t.Contain("codice fiscale è già presente", alert)
diff --git a/templates/schools_show.html.tpl b/templates/schools_show.html.tpl
index cdf811d4..f4708ee7 100644
--- a/templates/schools_show.html.tpl
+++ b/templates/schools_show.html.tpl
@@ -20,7 +20,7 @@
arrivo" si prega di controllare la cartella "Spam".
- Le credenziali generate sono:
+ Le credenziali della scuola sono comunque riportate di seguito. Si prega di prenderne nota.
- Username
- {{.Data.Username}}
- Password
- {{.Data.Password}}