From db98213818c52e7b440047117eb1ccecb0ef274f Mon Sep 17 00:00:00 2001
From: mmeest <martin.maasik.001@mail.ee>
Date: Wed, 18 Jun 2025 12:33:18 +0300
Subject: [PATCH 1/3] added new tests

---
 test/integration/admin_area/zones_test.rb | 116 ++++++++++++++++++++++
 1 file changed, 116 insertions(+)

diff --git a/test/integration/admin_area/zones_test.rb b/test/integration/admin_area/zones_test.rb
index bf7c07d7b..025eda9f2 100644
--- a/test/integration/admin_area/zones_test.rb
+++ b/test/integration/admin_area/zones_test.rb
@@ -24,4 +24,120 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
     assert_equal "attachment; filename=\"test.txt\"; filename*=UTF-8''test.txt", response.headers['Content-Disposition']
     assert_not_empty response.body
   end
+
+  def test_shows_new_form
+    get new_admin_zone_path
+    assert_response :success
+
+    unless response.body.include?('<form')
+      puts "[DEBUG] 'form' not found in response body for new_admin_zone_path"
+      puts response.body
+    end
+
+    assert_includes response.body, '<form', "'form' element not found"
+  end
+
+  def test_shows_index
+    get admin_zones_path
+    assert_response :success
+
+    unless response.body.include?('<table')
+      puts "[DEBUG] 'table' not found in response body for admin_zones_path"
+      puts response.body
+    end
+
+    assert_includes response.body, '<table', "'table' element not found"
+  end
+
+  def test_creates_zone_successfully
+    assert_difference 'DNS::Zone.count' do
+      post admin_zones_path, params: {
+        zone: {
+          origin: 'example.org',
+          ttl: 3600,
+          refresh: 1200,
+          retry: 1800,
+          expire: 3600000,
+          minimum_ttl: 600,
+          email: 'admin@example.org',
+          master_nameserver: 'ns1.example.org'
+
+        }
+      }
+    end
+
+    assert_redirected_to admin_zones_url
+    follow_redirect!
+    assert_response :success
+
+    # If the table is not found in response body, print the response body
+    unless response.body.include?('<table')
+      puts "[DEBUG] 'table' not found after redirect following zone creation"
+      puts response.body
+    end
+
+    assert_includes response.body, '<table', "'table' element not found after zone cration"
+  end
+
+  def test_fails_to_create_zone_with_invalid_data
+    assert_no_difference 'DNS::Zone.count' do
+      post admin_zones_path, params: {
+        zone: {
+          origin: '',
+          email: ''
+        }
+      }
+
+      assert_response :success
+
+      # If the form is not found in response body, print the response body
+      unless response.body.include?('<form')
+        puts "[DEBUG] 'form' not found in response body for edit_admin_zone_path"
+        puts response.body
+      end
+
+      assert_includes response.body, '<form', "'form' element not found"
+    end
+  end
+
+  def test_shows_edit_form
+    get edit_admin_zone_path(@zone)
+    assert_response :success
+    assert_includes response.body, '<form', "'form' element not found in edit form"
+  end
+
+  def test_fails_to_update_zone_with_invalid_data
+    patch admin_zone_path(@zone), params: { zone: { origin: '' }}
+
+    assert_response :success
+
+    # If the form is not found in response body, print the response body
+    unless response.body.include?('<form')
+      puts "[DEBUG] 'form' not found in response body after invalid update"
+      puts response.body
+    end
+
+    assert_includes response.body, '<form', "'form' element not found after invalid update"
+
+    @zone.reload
+    assert_not_equal '', @zone.origin
+  end
+
+  def test_redirects_to_index_after_successful_operations
+    # Test redirect_to_index private method through public methods
+    post admin_zones_path, params: {
+      zone: {
+        origin: 'redirect-test.org',
+        ttl: 3600,
+        refresh: 1200,
+        retry: 1800,
+        expire: 3600000,
+        minimum_ttl: 600,
+        email: 'admin@redirect-test.org',
+        master_nameserver: 'ns1.redirect-test.org'
+      }
+    }
+    
+    assert_redirected_to admin_zones_url
+  end
 end

From ffec4fd403d6623142a3e258747efa5437d0afcf Mon Sep 17 00:00:00 2001
From: mmeest <martin.maasik.001@mail.ee>
Date: Thu, 26 Jun 2025 11:34:50 +0300
Subject: [PATCH 2/3] updated tests

---
 test/integration/admin_area/zones_test.rb | 41 +++--------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

diff --git a/test/integration/admin_area/zones_test.rb b/test/integration/admin_area/zones_test.rb
index 025eda9f2..1d4812827 100644
--- a/test/integration/admin_area/zones_test.rb
+++ b/test/integration/admin_area/zones_test.rb
@@ -28,25 +28,11 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
   def test_shows_new_form
     get new_admin_zone_path
     assert_response :success
-
-    unless response.body.include?('<form')
-      puts "[DEBUG] 'form' not found in response body for new_admin_zone_path"
-      puts response.body
-    end
-
-    assert_includes response.body, '<form', "'form' element not found"
   end
 
   def test_shows_index
     get admin_zones_path
     assert_response :success
-
-    unless response.body.include?('<table')
-      puts "[DEBUG] 'table' not found in response body for admin_zones_path"
-      puts response.body
-    end
-
-    assert_includes response.body, '<table', "'table' element not found"
   end
 
   def test_creates_zone_successfully
@@ -69,14 +55,6 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
     assert_redirected_to admin_zones_url
     follow_redirect!
     assert_response :success
-
-    # If the table is not found in response body, print the response body
-    unless response.body.include?('<table')
-      puts "[DEBUG] 'table' not found after redirect following zone creation"
-      puts response.body
-    end
-
-    assert_includes response.body, '<table', "'table' element not found after zone cration"
   end
 
   def test_fails_to_create_zone_with_invalid_data
@@ -89,21 +67,12 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
       }
 
       assert_response :success
-
-      # If the form is not found in response body, print the response body
-      unless response.body.include?('<form')
-        puts "[DEBUG] 'form' not found in response body for edit_admin_zone_path"
-        puts response.body
-      end
-
-      assert_includes response.body, '<form', "'form' element not found"
     end
   end
 
   def test_shows_edit_form
     get edit_admin_zone_path(@zone)
     assert_response :success
-    assert_includes response.body, '<form', "'form' element not found in edit form"
   end
 
   def test_fails_to_update_zone_with_invalid_data
@@ -111,12 +80,6 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
 
     assert_response :success
 
-    # If the form is not found in response body, print the response body
-    unless response.body.include?('<form')
-      puts "[DEBUG] 'form' not found in response body after invalid update"
-      puts response.body
-    end
-
     assert_includes response.body, '<form', "'form' element not found after invalid update"
 
     @zone.reload
@@ -139,5 +102,9 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
     }
     
     assert_redirected_to admin_zones_url
+
+    follow_redirect!
+    assert_response :success
+    assert_includes response.body, 'Zone has been created'
   end
 end

From 249aad16b7d00e63a5653a55db506da3a39c7eab Mon Sep 17 00:00:00 2001
From: mmeest <martin.maasik.001@mail.ee>
Date: Thu, 26 Jun 2025 13:09:16 +0300
Subject: [PATCH 3/3] Added assertions for failded zone update messages

---
 test/integration/admin_area/zones_test.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/integration/admin_area/zones_test.rb b/test/integration/admin_area/zones_test.rb
index 1d4812827..69fe650c5 100644
--- a/test/integration/admin_area/zones_test.rb
+++ b/test/integration/admin_area/zones_test.rb
@@ -76,14 +76,15 @@ class AdminAreaZonesIntegrationTest < ApplicationIntegrationTest
   end
 
   def test_fails_to_update_zone_with_invalid_data
-    patch admin_zone_path(@zone), params: { zone: { origin: '' }}
+    patch admin_zone_path(@zone), params: { zone: { ttl: '' }}
 
     assert_response :success
 
-    assert_includes response.body, '<form', "'form' element not found after invalid update"
-
+    assert_includes response.body, "Ttl", "Ttl field error should be shown"
+    assert_includes response.body, "Ttl is missing", "Presence validation message expected"
+  
     @zone.reload
-    assert_not_equal '', @zone.origin
+    refute_equal '', @zone.ttl, "Ttl should not have changed"
   end
 
   def test_redirects_to_index_after_successful_operations