[tests] add image testing

Signed-off-by: Maxim Eryomenko <[email protected]>

Author: moeryomenko

.github/workflows/dockerimage.yml

@@ -19,9 +19,11 @@ jobs:
       run: docker build . -t build
     - name: Testing image
       shell: bash
+      working-directory: tests
       run: |
-        docker run -d -p 8080:80 build
-        ./tests/test.sh
+        docker build . -t test
+        docker run -d -p 8080:80 test
+        ./test.sh
         docker stop $(docker ps -aq)
     - name: Push the Docker image
       if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')

README.md

@@ -1,15 +1,6 @@
 # ngxjs
 This nginx container with support modules njs and Brotli, also use BoringSSL instead OpenSSL.
 
-## Testing
-
-```bash
-$ docker run -p 8080:80 ngxjs:v0.0.2
-$ ./tests/test.sh
-
-Test passed!
-```
-
 ## Usage
 
 In your Dockerfile just use in `FROM` directive and `COPY` your assets to `/usr/share/nginx/html` folder.

nginx.conf

@@ -25,15 +25,17 @@ http {
              application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype
              application/x-font-ttf application/x-javascript application/xhtml+xml application/xml
              font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon
-             image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml;
+             image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml
+             image/bmp image/png image/gif image/jpeg image/jpg;
 
     brotli on;
     brotli_comp_level 6;
     brotli_types application/atom+xml application/javascript application/json application/rss+xml
              application/vnd.ms-fontobject application/x-font-opentype application/x-font-truetype
              application/x-font-ttf application/x-javascript application/xhtml+xml application/xml
              font/eot font/opentype font/otf font/truetype image/svg+xml image/vnd.microsoft.icon
-             image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml;
+             image/x-icon image/x-win-bitmap text/css text/javascript text/plain text/xml
+             image/bmp image/png image/gif image/jpeg image/jpg;
 
     server {
         listen       80;

tests/Dockerfile

@@ -0,0 +1,7 @@
+FROM build
+
+COPY assets /usr/share/nginx/html
+
+EXPOSE 80
+
+ENTRYPOINT [ "nginx", "-g", "daemon off;" ]

tests/assets/image.jpg

@@ -0,0 +1 @@
+assets/image.jpg

tests/expected_image.jpg

@@ -6,33 +6,51 @@ DIR=$(dirname "$0")
 
 basic_case () {
 	curl http://$host:8080 > $DIR/basic_case.html
-	check "basic_case"
+	check "basic_case.html"
 }
 
 gzip_case () {
 	curl -sH 'Accept-encoding: gzip' http://$host:8080 | gunzip - > $DIR/gzip.html
-	check "gzip"
+	check "gzip.html"
 }
 
 brotli_case () {
 	curl -sH 'Accept-encoding: br' http://$host:8080 | brotli --decompress - > $DIR/brotli.html
-	check "brotli"
+	check "brotli.html"
+}
+
+basic_image_case () {
+	curl http://$host:8080/image.jpg > $DIR/image.jpg
+	check "image.jpg"
+}
+
+gzip_image_case () {
+	curl -sH 'Accept-encoding: gzip' http://$host:8080/image.jpg | gunzip - > $DIR/image.jpg
+	check "image.jpg"
+}
+
+brotli_image_case () {
+	curl -sH 'Accept-encoding: br' http://$host:8080/image.jpg | brotli --decompress - > $DIR/image.jpg
+	check "image.jpg"
 }
 
 check () {
-	if [ -z `diff $DIR/$1.html $DIR/expected_$1.html` ]; then
-		rm $DIR/$1.html
+	if [ -z `diff $DIR/$1 $DIR/expected_$1` ]; then
+		rm $DIR/$1
 		return
 	fi
 
-	rm $DIR/$1.html
+	rm $DIR/$1
 	echo -e "\n\e[31mTest" $1 "failed!\e[0m\n"
 	exit 1
 }
 
 basic_case
 gzip_case
 brotli_case
+basic_image_case
+gzip_image_case
+brotli_image_case
 
 echo -e "\n\e[32mTests passed!\e[0m\n"
 exit 0