merge master conflicts

2 files changed, 35 insertions, 3 deletions

diff --git a/test/lib/powerdnsex/managers/records_manager_test.exs b/test/lib/powerdnsex/managers/records_manager_test.exs
index 3b91fc2..5f314bd 100644
--- a/test/lib/powerdnsex/managers/records_manager_test.exs
+++ b/test/lib/powerdnsex/managers/records_manager_test.exs
@@ -25,6 +25,18 @@ defmodule PowerDNSex.RecordsManagerTest do
     records: [{"127.0.0.1", true}]
   }
 
+  @invalid_record %{
+    name: "updated-record.my-domain.art.",
+    type: "NS",
+    ttl: 86800,
+    records: [{"127.0.0.1", true}]
+  }
+
+  @invalid_zone %Zone{
+    name: "not-canonical-domain.tst",
+    url: "api/v1/servers/localhost/zones/not-canonical-domain.tst"
+  }
+
   setup do
    # Config.set_url
    # Config.set_token
@@ -64,10 +76,30 @@ defmodule PowerDNSex.RecordsManagerTest do
       end
     end
 
+    @tag :records_manager_update
     test "the return given correct params" do
       use_cassette "records_manager/update/success" do
         assert RecordsManager.update(@valid_zone, @updated_record) == :ok
       end
     end
+
+    @tag :records_manager_update
+    test "the return given incorrect zone" do
+      use_cassette "records_manager/update/not_found" do
+        response = RecordsManager.update(@invalid_zone, @updated_record)
+        error_msg = "Could not find domain '#{@invalid_zone.name}.'"
+        assert response.error == error_msg
+      end
+    end
+
+    @tag :records_manager_update
+    test "the return given incorrect params" do
+      use_cassette "records_manager/update/invalid_record" do
+        response = RecordsManager.update(@valid_zone, @invalid_record)
+        error_msg = "Record updated-record.my-domain.art./NS '127.0.0.1': " <>
+                    "Not in expected format (parsed as '127.0.0.1.')"
+        assert response.error == error_msg
+      end
+    end
   end
 end
diff --git a/test/lib/powerdnsex/managers/zones_manager_test.exs b/test/lib/powerdnsex/managers/zones_manager_test.exs
index 2e88c70..b3aa5ef 100644
--- a/test/lib/powerdnsex/managers/zones_manager_test.exs
+++ b/test/lib/powerdnsex/managers/zones_manager_test.exs
@@ -104,15 +104,15 @@ defmodule PowerDNSex.ZonesManagerTest do
     @tag :zones_manager_delete
     test "return given correct params" do
       use_cassette "zones_manager/delete/success" do
-        assert ZonesManager.delete("success-delete.com") == :ok
+        assert ZonesManager.delete(@valid_zone_test.name) == :ok
       end
     end
 
     @tag :zones_manager_delete
     test "return error when zone don't exists" do
       use_cassette "zones_manager/delete/not_found" do
-        response = ZonesManager.delete("not_found.com")
-        assert response.error == "Could not find domain 'not_found.com.'"
+        response = ZonesManager.delete(@unknown_name)
+        assert response.error == "Could not find domain '#{@unknown_name}'"
       end
     end
   end