From 1005126a5f0abdc8c0488ce29cf30142baaac67d Mon Sep 17 00:00:00 2001
From: Eneko Lakasta <eneko@cartodb.com>
Date: Tue, 8 May 2018 14:32:44 +0200
Subject: [PATCH] re-organize no api key token provided tests

---
 .../auth/authorization-basic-use-cases.js     | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/test/acceptance/auth/authorization-basic-use-cases.js b/test/acceptance/auth/authorization-basic-use-cases.js
index bfd300fc..9657ebcb 100644
--- a/test/acceptance/auth/authorization-basic-use-cases.js
+++ b/test/acceptance/auth/authorization-basic-use-cases.js
@@ -103,45 +103,6 @@ describe('Basic authorization use cases', function () {
         );
     });
 
-    it("succeed with default - sending no api key token", function (done) {
-        var layergroup = singleLayergroupConfig(pointSqlPublic, '#layer { marker-fill:red; }');
-
-        assert.response(server,
-            createRequest(layergroup, 'localhost'),
-            {
-                status: 200
-            },
-            function (res, err) {
-                assert.ifError(err);
-
-                var parsed = JSON.parse(res.body);
-                assert.ok(parsed.layergroupid);
-                assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);
-
-                keysToDelete['map_cfg|' + LayergroupToken.parse(parsed.layergroupid).token] = 0;
-                keysToDelete['user:localhost:mapviews:global'] = 5;
-
-                done();
-            }
-        );
-    });
-
-    it("fail with default - sending no api key token", function (done) {
-        var layergroup = singleLayergroupConfig(pointSqlMaster, '#layer { marker-fill:red; }');
-
-        assert.response(server,
-            createRequest(layergroup, 'localhost'),
-            {
-                status: 403
-            },
-            function (res, err) {
-                assert.ifError(err);
-
-                done();
-            }
-        );
-    });
-
     it("fail with non-existent api key", function (done) {
         var layergroup = singleLayergroupConfig(pointSqlPublic, '#layer { marker-fill:red; }');
 
@@ -176,4 +137,45 @@ describe('Basic authorization use cases', function () {
             }
         );
     });
+
+    describe('No api key provided fallback', function () {
+        it("succeed with default", function (done) {
+            var layergroup = singleLayergroupConfig(pointSqlPublic, '#layer { marker-fill:red; }');
+
+            assert.response(server,
+                createRequest(layergroup, 'localhost'),
+                {
+                    status: 200
+                },
+                function (res, err) {
+                    assert.ifError(err);
+
+                    var parsed = JSON.parse(res.body);
+                    assert.ok(parsed.layergroupid);
+                    assert.equal(res.headers['x-layergroup-id'], parsed.layergroupid);
+
+                    keysToDelete['map_cfg|' + LayergroupToken.parse(parsed.layergroupid).token] = 0;
+                    keysToDelete['user:localhost:mapviews:global'] = 5;
+
+                    done();
+                }
+            );
+        });
+
+        it("fail with default", function (done) {
+            var layergroup = singleLayergroupConfig(pointSqlMaster, '#layer { marker-fill:red; }');
+
+            assert.response(server,
+                createRequest(layergroup, 'localhost'),
+                {
+                    status: 403
+                },
+                function (res, err) {
+                    assert.ifError(err);
+
+                    done();
+                }
+            );
+        });
+    });
 });