From 839db68571037f6fff8273aaade6ea0bd14ea8a5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 16 May 2018 14:59:10 +0200
Subject: Fix TSLint rules

---
 packages/sra-report/src/index.ts                       | 13 ++++++++++++-
 packages/sra-report/src/postman_environment_factory.ts | 14 ++++++++++----
 packages/sra-report/test/test_runner.ts                | 11 ++++++-----
 3 files changed, 28 insertions(+), 10 deletions(-)

(limited to 'packages/sra-report')

diff --git a/packages/sra-report/src/index.ts b/packages/sra-report/src/index.ts
index 9a203b654..3b72ad44e 100644
--- a/packages/sra-report/src/index.ts
+++ b/packages/sra-report/src/index.ts
@@ -13,7 +13,18 @@ import { postmanEnvironmentFactory } from './postman_environment_factory';
 import { utils } from './utils';
 
 const DEFAULT_NETWORK_ID = 1;
-const SUPPORTED_NETWORK_IDS = [1, 3, 4, 42];
+const networkNameToId: { [networkName: string]: number } = {
+    mainnet: 1,
+    ropsten: 3,
+    rinkeby: 4,
+    kovan: 42,
+};
+const SUPPORTED_NETWORK_IDS = [
+    networkNameToId.mainnet,
+    networkNameToId.ropsten,
+    networkNameToId.rinkeby,
+    networkNameToId.kovan,
+];
 
 // extract command line arguments
 const args = yargs
diff --git a/packages/sra-report/src/postman_environment_factory.ts b/packages/sra-report/src/postman_environment_factory.ts
index 42389aea2..e899aaa79 100644
--- a/packages/sra-report/src/postman_environment_factory.ts
+++ b/packages/sra-report/src/postman_environment_factory.ts
@@ -11,6 +11,12 @@ import { addresses as rinkebyAddresses } from './contract_addresses/rinkeby_addr
 import { addresses as ropstenAddresses } from './contract_addresses/ropsten_addresses';
 
 const ENVIRONMENT_NAME = 'SRA Report';
+const networkNameToId: { [networkName: string]: number } = {
+    mainnet: 1,
+    ropsten: 3,
+    rinkeby: 4,
+    kovan: 42,
+};
 
 export interface EnvironmentValue {
     key: string;
@@ -107,13 +113,13 @@ async function createOrderEnvironmentValuesAsync(url: string): Promise<Environme
 }
 function getContractAddresses(networkId: number): Addresses {
     switch (networkId) {
-        case 1:
+        case networkNameToId.mainnet:
             return mainnetAddresses;
-        case 3:
+        case networkNameToId.ropsten:
             return ropstenAddresses;
-        case 4:
+        case networkNameToId.rinkeby:
             return rinkebyAddresses;
-        case 42:
+        case networkNameToId.kovan:
             return kovanAddresses;
         default:
             throw new Error('Unsupported network id');
diff --git a/packages/sra-report/test/test_runner.ts b/packages/sra-report/test/test_runner.ts
index 91ef6aa4e..eb4db7af3 100644
--- a/packages/sra-report/test/test_runner.ts
+++ b/packages/sra-report/test/test_runner.ts
@@ -23,6 +23,7 @@ const expect = chai.expect;
 
 const CONTENT_TYPE_ASSERTION_NAME = 'Has Content-Type header with value application/json';
 const SCHEMA_ASSERTION_NAME = 'Schema is valid';
+const SUCCESS_STATUS = 200;
 const baseNewmanRunOptions = {
     collection: sraReportCollectionJSON,
     environment: postmanEnvironmentJSON,
@@ -45,7 +46,7 @@ export const testRunner = {
         };
         describe(CONTENT_TYPE_ASSERTION_NAME, () => {
             it('fails when there are no headers', async () => {
-                nockInterceptor.reply(200, {});
+                nockInterceptor.reply(SUCCESS_STATUS, {});
                 const summary = await utils.newmanRunAsync(newmanRunOptions);
                 const error = findAssertionErrorIfExists(
                     summary,
@@ -60,7 +61,7 @@ export const testRunner = {
                 const headers = {
                     'Content-Type': 'text/html',
                 };
-                nockInterceptor.reply(200, {}, headers);
+                nockInterceptor.reply(SUCCESS_STATUS, {}, headers);
                 const summary = await utils.newmanRunAsync(newmanRunOptions);
                 const error = findAssertionErrorIfExists(
                     summary,
@@ -75,7 +76,7 @@ export const testRunner = {
                 const headers = {
                     'Content-Type': 'charset=utf-8; application/json',
                 };
-                nockInterceptor.reply(200, {}, headers);
+                nockInterceptor.reply(SUCCESS_STATUS, {}, headers);
                 const summary = await utils.newmanRunAsync(newmanRunOptions);
                 const error = findAssertionErrorIfExists(
                     summary,
@@ -99,7 +100,7 @@ export const testRunner = {
         };
         describe(SCHEMA_ASSERTION_NAME, () => {
             it('fails when schema is invalid', async () => {
-                nockInterceptor.reply(200, malformedJson);
+                nockInterceptor.reply(SUCCESS_STATUS, malformedJson);
                 const summary = await utils.newmanRunAsync(newmanRunOptions);
                 const error = findAssertionErrorIfExists(summary, postmanCollectionRequestName, SCHEMA_ASSERTION_NAME);
                 const errorMessage = _.get(error, 'message');
@@ -107,7 +108,7 @@ export const testRunner = {
                 expect(errorMessage).to.equal('expected false to be true');
             });
             it('passes when schema is valid', async () => {
-                nockInterceptor.reply(200, correctJson);
+                nockInterceptor.reply(SUCCESS_STATUS, correctJson);
                 const summary = await utils.newmanRunAsync(newmanRunOptions);
                 const error = findAssertionErrorIfExists(summary, postmanCollectionRequestName, SCHEMA_ASSERTION_NAME);
                 const errorMessage = _.get(error, 'message');
-- 
cgit v1.2.3