custom content

Author: ahelal

test/integration/manage/manage.yml

@@ -4,6 +4,33 @@
   gather_facts : True
   become       : True
   connection   : "{{ kitchen_connection | default('local') }}"
+  pre_tasks:
+            - name: update apt
+              apt: update_cache=yes cache_valid_time=3600
+
+            - name: One time tasks for testing
+              shell: "mkdir -p /etc/nginx/sites-enabled/ && touch /etc/nginx/sites-enabled/remove_me.conf && touch /tmp/creates"
+              args:
+                creates: /tmp/creates
+
+            - name: Create dir for content
+              file:
+                path="/nginx/{{ item }}"
+                state=directory
+                mode=0755
+              with_items: 
+                - test2
+                - test3
+
+            - name: Create content for test 
+              copy:
+                content="Hello {{ item }}"
+                dest="/nginx/{{ item }}/index.html"
+                mode=0644
+              with_items: 
+                - test2
+                - test3
+
   vars         :
         nginx_manage_sites               : True
         nginx_site                       :
@@ -18,7 +45,7 @@
                                              name: /,
                                              type: location,
                                              try_files: "$uri $uri/ =404",
-                                             root: "{{ nginx_default_root }}"
+                                             root: "/nginx/test2"
                                            }
 
            - file_name                   : "test3"
@@ -32,16 +59,9 @@
                                              name: /,
                                              type: location,
                                              try_files: "$uri $uri/ =404",
-                                             root: "{{ nginx_default_root }}"
+                                             root: "/nginx/test3"
                                            }
-  pre_tasks:
-            - name: update apt
-              apt: update_cache=yes cache_valid_time=3600
 
-            - name: One time tasks for testing
-              shell: "mkdir -p /etc/nginx/sites-enabled/ && touch /etc/nginx/sites-enabled/remove_me.conf && touch /tmp/creates"
-              args:
-                creates: /tmp/creates
   roles        :
                  - "ansible-nginx"
 

test/integration/manage/serverspec/nginx_spec.rb

@@ -48,20 +48,14 @@
 
 describe 'NGinx http content' do
 
- describe command "curl -s -L http://127.0.0.1:1180 | grep h1" do 
+ describe command "curl -s -L http://127.0.0.1:1180" do 
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match "<h1>Welcome to nginx!</h1>" }
+    its(:stdout) { should match "Hello test2" }
   end
 
- describe command "curl -s -L http://127.0.0.1:1280 | grep h1" do 
+ describe command "curl -s -L http://127.0.0.1:1280" do 
     its(:exit_status) { should eq 0 }
-    its(:stdout) { should match "<h1>Welcome to nginx!</h1>" }
-  end
-
- describe command "cat /var/log/nginx/*" do 
-    its(:exit_status) { should eq 0 }
-    its(:stdout) { should match "XXXXXXXX" }
+    its(:stdout) { should match "Hello test3" }
   end
 
 end
-