Merge pull request Kong#809 from Mashape/fix/tests-update

Fixing test for full update in DAO
xvaara · Dec 16, 2015 · 441d906 · 441d906
2 parents 17c8ec4 + a6f76ab
commit 441d906
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 3 deletions.
diff --git a/spec/integration/admin_api/consumers_routes_spec.lua b/spec/integration/admin_api/consumers_routes_spec.lua
@@ -39,8 +39,10 @@ describe("Admin API", function()
 
     describe("PUT", function()
 
+      local consumer
+
       it("[SUCCESS] should create and update", function()
-        local consumer = send_content_types(BASE_URL, "PUT", {
+        consumer = send_content_types(BASE_URL, "PUT", {
           username = "consumer PUT tests"
         }, 201, nil, {drop_db=true})
 
@@ -61,6 +63,44 @@ describe("Admin API", function()
         }, 409, '{"username":"username already exists with value \'consumer PUT tests updated\'"}')
       end)
 
+      it("[SUCCESS] should update a Consumer", function()
+        local response, status = http_client.get(BASE_URL..consumer.id)
+        assert.equal(200, status)
+
+        local body = json.decode(response)
+        assert.falsy(body.custom_id)
+
+        body.custom_id = "custom123"
+        local response, status = http_client.put(BASE_URL, body)
+        assert.equal(200, status)
+        assert.truthy(response)
+
+        local response, status = http_client.get(BASE_URL..consumer.id)
+        assert.equal(200, status)
+
+        local body = json.decode(response)
+        assert.equal("custom123", body.custom_id)
+      end)
+
+      it("[SUCCESS] should update a Consumer and remove a field", function()
+        local response, status = http_client.get(BASE_URL..consumer.id)
+        assert.equal(200, status)
+
+        local body = json.decode(response)
+        assert.equal("custom123", body.custom_id)
+
+        body.custom_id = nil
+        local response, status = http_client.put(BASE_URL, body)
+        assert.equal(200, status)
+        assert.truthy(response)
+
+        local response, status = http_client.get(BASE_URL..consumer.id)
+        assert.equal(200, status)
+
+        local body = json.decode(response)
+        assert.falsy(body.custom_id)
+      end)
+
     end)
 
     describe("GET", function()

diff --git a/spec/integration/dao/cassandra/base_dao_spec.lua b/spec/integration/dao/cassandra/base_dao_spec.lua
@@ -317,14 +317,18 @@ describe("Cassandra", function()
 
           local api, err = dao_factory.apis:insert(api_t)
           assert.falsy(err)
-          assert.truthy(api_t.request_path)
+          assert.truthy(api.request_path)
 
           -- Update
           api.request_path = nil
           api, err = dao_factory.apis:update(api, true)
           assert.falsy(err)
           assert.truthy(api)
-          assert.falsy(api.request_path)
+
+          local rows, err = dao_factory.apis:find_by_keys({id = api.id})
+          assert.falsy(err)
+          assert.truthy(rows)
+          assert.falsy(rows[1].request_path)
 
           -- Check update
           api, err = session:execute("SELECT * FROM apis WHERE id = ?", {cassandra.uuid(api.id)})