Merge branch 'master' into regression-test-named-map-dataview-filter

test/acceptance/regressions.js

@@ -1,7 +1,7 @@
 require('../support/test_helper');
-
 var assert = require('../support/assert');
 var TestClient = require('../support/test-client');
+const LayergroupToken = require('../../lib/cartodb/models/layergroup-token');
 
 describe('regressions', function() {
 
@@ -38,6 +38,59 @@ describe('regressions', function() {
         });
     });
 
+    describe('map instantiation', function () {
+        const apikeyToken = 'regular1';
+        const mapConfig = {
+            version: '1.7.0',
+            layers: [{
+                type: 'cartodb',
+                options: {
+                    sql: 'select * from test_table_localhost_regular1',
+                    cartocss: TestClient.CARTOCSS.POINTS,
+                    cartocss_version: '2.3.0'
+                }
+            }]
+        };
+
+        it('should have distint timestamps when the source was updated', function (done) {
+            const testClient = new TestClient(mapConfig, apikeyToken);
+
+            testClient.getLayergroup({}, (err, layergroup) => {
+                if (err) {
+                    return done(err);
+                }
+
+                const { cacheBuster: cacheBusterA } = LayergroupToken.parse(layergroup.layergroupid);
+
+                const conn = testClient.getDBConnection();
+
+                const sql = `select CDB_TableMetadataTouch('test_table_localhost_regular1'::regclass)`;
+
+                conn.query(sql, (err) => {
+                    if (err) {
+                        return done(err);
+                    }
+
+                    testClient.getLayergroup({}, (err, layergroup) => {
+                        if (err) {
+                            return done(err);
+                        }
+
+                        const { cacheBuster: cacheBusterB } = LayergroupToken.parse(layergroup.layergroupid);
+
+                        const timestampA = parseInt(cacheBusterA, 10);
+                        const timestampB = parseInt(cacheBusterB, 10);
+
+                        assert.notEqual(timestampA, timestampB);
+                        assert.ok(timestampA < timestampB, `timestampA: ${timestampA} > timestampB:${timestampB}`);
+
+                        testClient.drain(done);
+                    });
+                });
+            });
+        });
+    });
+
     it('should create and instantiate a named map with filters', function (done) {
         const apikeyToken = '1234';
 

test/support/sql/windshaft.test.sql

@@ -465,6 +465,8 @@ CREATE INDEX test_table_localhost_regular1_the_geom_webmercator_idx ON test_tabl
 GRANT ALL ON TABLE test_table_localhost_regular1 TO :TESTUSER;
 GRANT ALL ON TABLE test_table_localhost_regular1 TO test_windshaft_regular1;
 
+INSERT INTO CDB_TableMetadata (tabname, updated_at) VALUES ('test_table_localhost_regular1'::regclass, '2009-02-13T23:31:30.123Z');
+
 -- analysis tables -----------------------------------------------
 
 ALTER TABLE cdb_analysis_catalog OWNER TO :TESTUSER;

test/support/test-client.js

@@ -1241,6 +1241,19 @@ TestClient.prototype.setUserRenderTimeoutLimit = function (user, userTimeoutLimi
     helper.configureMetadata('hmset', params, callback);
 };
 
+TestClient.prototype.getDBConnection = function () {
+    const dbname = _.template(global.environment.postgres_auth_user, { user_id: 1 }) + '_db';
+
+    const psql = new PSQL({
+        user: 'postgres',
+        dbname: dbname,
+        host: global.environment.postgres.host,
+        port: global.environment.postgres.port
+    });
+
+    return psql;
+};
+
 TestClient.prototype.setUserDatabaseTimeoutLimit = function (timeoutLimit, callback) {
     const dbname = _.template(global.environment.postgres_auth_user, { user_id: 1 }) + '_db';
     const dbuser = _.template(global.environment.postgres_auth_user, { user_id: 1 });