Add more sample tests + cleanup

Author: Mateusz

Makefile

@@ -1,4 +1,4 @@
-test: linter compose-up-test test_deps
+test: compose-up-test test_deps
 	sleep 5
 	bundle exec rspec ./tests/spec
 	docker-compose -f docker-compose-test.yml down

README.md

@@ -1,4 +1,21 @@
 API GATEWAY DEMO
 ================
 
-Simple nginx gateway with tests.
+This is an example how to test nginx api gateway with ruby rspec.
+
+# Prerequisites
+* [docker](https://www.docker.com/)
+* [docker-compose](https://docs.docker.com/compose/)
+* [ruby 2.4.0](https://www.ruby-lang.org/en/news/2016/12/25/ruby-2-4-0-released/)
+* [bundler](http://bundler.io/)
+
+# Run tests
+Set up testing environment:
+~~~bash
+$ make compose-up-test
+~~~
+
+Execute tests:
+~~~bash
+$ make test
+~~~

nginx/nginx.conf

@@ -4,12 +4,10 @@ worker_processes  1;
 error_log  /var/log/nginx/error.log warn;
 pid        /var/run/nginx.pid;
 
-
 events {
     worker_connections  1024;
 }
 
-
 http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
@@ -23,11 +21,6 @@ http {
     access_log  /var/log/nginx/access.log  main;
 
     sendfile        on;
-    #tcp_nopush     on;
-
     keepalive_timeout  65;
-
-    #gzip  on;
-
     include /etc/nginx/conf.d/*.conf;
 }

tests/spec/gateway_spec.rb

@@ -1,5 +1,5 @@
 describe "gateway" do
-  context "_health" do
+  context "/_health" do
     context "get" do
       result = Client.get "http://localhost:81/_health"
       it "return 200" do
@@ -19,6 +19,9 @@
       it "proxy to service2" do
         expect(result.body).to eq("https://service2.myapi.com/v1/path1")
       end
+      it "response header does not contain nginx version" do
+        expect(result.headers[:server]).to eq("nginx")
+      end
     end
     context "/some_id" do
       context "get" do
@@ -29,6 +32,32 @@
         it "proxy to service1" do
           expect(result.body).to eq("https://service1.myapi.com/v1/path1/some_id")
         end
+        it "response header does not contain nginx version" do
+          expect(result.headers[:server]).to eq("nginx")
+        end
+      end
+    end
+  end
+  context "/path2" do
+    context "get" do
+      result = Client.get "http://localhost:81/path2"
+      it "return 404" do
+        expect(result.code).to eq(404)
+      end
+      it "response header does not contain nginx version" do
+        expect(result.headers[:server]).to eq("nginx")
+      end
+    end
+    context "/some_id" do
+      result = Client.get "http://localhost:81/path2/some_id"
+      it "return 200" do
+        expect(result.code).to eq(200)
+      end
+      it "proxy to service3" do
+        expect(result.body).to eq("https://service3.myapi.com/v1/path2/some_id")
+      end
+      it "response header does not contain nginx version" do
+        expect(result.headers[:server]).to eq("nginx")
       end
     end
   end