Skip to content

NOPS-48 Delete FastFT code. #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

NOPS-48 Delete FastFT code. #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/active.single-region-failure.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const proxyquire = require('proxyquire');
const expect = require('chai').expect;
const itemFixture = require('./fixtures/fastft.json');
const itemFixture = require('./fixtures/redirected.json');
const metricsMock = require('./utils/metrics-mock');

const active = proxyquire('../lib/active', {
Expand Down
2 changes: 1 addition & 1 deletion test/active.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const proxyquire = require('proxyquire');
const expect = require('chai').expect;
const itemFixture = require('./fixtures/fastft.json');
const itemFixture = require('./fixtures/redirected.json');
const metricsMock = require('./utils/metrics-mock');
const sinon = require('sinon');
const dynamosInitStub = sinon.stub();
Expand Down
16 changes: 8 additions & 8 deletions test/batch-get.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

const proxyquire = require('proxyquire');
const expect = require('chai').expect;
const fastFtFixture = require('./fixtures/fastft.json');
const redirectedFixture = require('./fixtures/redirected.json');
const justasFastFtFixture = require('./fixtures/justasfastft.json');
const metricsMock = require('./utils/metrics-mock');

Expand All @@ -11,7 +11,7 @@ const mockInstance = {
cb(null, {
Responses: {
urlmgmtapi_primary: [
fastFtFixture.Item,
redirectedFixture.Item,
justasFastFtFixture.Item
]
}
Expand All @@ -34,13 +34,13 @@ describe('#batchGet', () => {

before(() => main.init({ metrics: metricsMock, timeout: 500 }));

it('should #get /fastft and /justasfastft', () => {
return main.batchGet(['https://www.ft.com/fastft', 'https://www.ft.com/justasfastft'])
it('should #get /redirected and /justasfastft', () => {
return main.batchGet(['https://www.ft.com/redirected', 'https://www.ft.com/justasfastft'])
.then(data => {
expect(data).to.eql([
{
code: 100,
fromURL: 'https://www.ft.com/fastft',
fromURL: 'https://www.ft.com/redirected',
toURL: 'https://www.ft.com/stream/brandId/NTlhNzEyMzMtZjBjZi00Y2U1LTg0ODUtZWVjNmEyYmU1NzQ2-QnJhbmRz'
},
{
Expand All @@ -53,12 +53,12 @@ describe('#batchGet', () => {
});

it('should return a vanity-like response if the database doesn\'t contain a url', () => {
return main.batchGet(['https://www.ft.com/fastft', 'https://www.ft.com/unknown'])
return main.batchGet(['https://www.ft.com/redirected', 'https://www.ft.com/unknown'])
.then(data => {
expect(data).to.eql([
{
code: 100,
fromURL: 'https://www.ft.com/fastft',
fromURL: 'https://www.ft.com/redirected',
toURL: 'https://www.ft.com/stream/brandId/NTlhNzEyMzMtZjBjZi00Y2U1LTg0ODUtZWVjNmEyYmU1NzQ2-QnJhbmRz'
},
{
Expand All @@ -71,7 +71,7 @@ describe('#batchGet', () => {
});

it('should reject urls with trailing slashes to the slash-less url', () => {
return main.batchGet(['https://www.ft.com/fastft/'])
return main.batchGet(['https://www.ft.com/redirected/'])
.then(() => {
throw new Error('should have thrown');
}, err => {
Expand Down
7 changes: 0 additions & 7 deletions test/fixtures/encodedUrl.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/fixtures/fastft.json → test/fixtures/redirected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Item": {
"FromURL": { "S": "https://www.ft.com/fastft" },
"FromURL": { "S": "https://www.ft.com/redirected" },
"Code": { "N": "100" },
"ToURL": { "S": "https://www.ft.com/stream/brandId/NTlhNzEyMzMtZjBjZi00Y2U1LTg0ODUtZWVjNmEyYmU1NzQ2-QnJhbmRz" }
}
Expand Down
19 changes: 8 additions & 11 deletions test/get.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,17 @@

const proxyquire = require('proxyquire');
const expect = require('chai').expect;
const itemFixture = require('./fixtures/fastft.json');
const encodedUrlFixture = require('./fixtures/encodedUrl.json');
const itemFixture = require('./fixtures/redirected.json');
const metricsMock = require('./utils/metrics-mock');
let called = false;

const mockInstance = {
getItem: (opts, cb) => {
called = true;
if (opts.Key.FromURL.S === 'https://www.ft.com/fastft') {
if (opts.Key.FromURL.S === 'https://www.ft.com/redirected') {
setTimeout(() => cb(null, itemFixture))
} else if (opts.Key.FromURL.S === 'https://www.ft.com/slowft') {
setTimeout(() => cb(null, itemFixture), 1000)
} else if (opts.Key.FromURL.S === 'https://www.ft.com/fästft') {
setTimeout(() => cb(null, encodedUrlFixture))
} else {
setTimeout(() => cb(null, {}));
}
Expand All @@ -38,12 +35,12 @@ describe('#get', () => {
before(() => main.init({ metrics: metricsMock, timeout: 500 }));
afterEach(() => called = false)

it('should #get /fastft', () => {
return main.get('https://www.ft.com/fastft')
it('should #get /redirected', () => {
return main.get('https://www.ft.com/redirected')
.then(data => {
expect(data).to.eql({
code: 100,
fromURL: 'https://www.ft.com/fastft',
fromURL: 'https://www.ft.com/redirected',
toURL: 'https://www.ft.com/stream/brandId/NTlhNzEyMzMtZjBjZi00Y2U1LTg0ODUtZWVjNmEyYmU1NzQ2-QnJhbmRz'
});
});
Expand All @@ -70,12 +67,12 @@ describe('#get', () => {
});

it('should redirect urls with trailing slashes to the slash-less url', () => {
return main.get('https://www.ft.com/fastft/')
return main.get('https://www.ft.com/anypath/')
.then(data => {
expect(data).to.eql({
code: 301,
fromURL: 'https://www.ft.com/fastft/',
toURL: 'https://www.ft.com/fastft'
fromURL: 'https://www.ft.com/anypath/',
toURL: 'https://www.ft.com/anypath'
});
});
});
Expand Down