Rework cert stub data

heroku · Mar 6, 2024 · 418bb62 · 418bb62
1 parent 9e67df6
commit 418bb62
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 38 deletions.
diff --git a/packages/cli/test/helpers/stubs/sni-endpoints.ts b/packages/cli/test/helpers/stubs/sni-endpoints.ts
@@ -1,5 +1,3 @@
-import heredoc from 'tsheredoc'
-
 export type Endpoint = {
   name: string
   cname: string | null
@@ -110,29 +108,32 @@ export const endpointWithDomains: Endpoint = {
   },
 }
 
-export function certificateDetails() {
-  return `
-    Common Name(s): example.org
-    Expires At:     2013-08-01 21:34 UTC
-    Issuer:         /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
-    Starts At:      2012-08-01 21:34 UTC
-    Subject:        /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
-    SSL certificate is self signed.
-  `
-}
-
-export function certificateDetailsWithDomains() {
-  return `
-    Common Name(s): example.org
-    Domain(s):      subdomain.example.com
-    Expires At:     2013-08-01 21:34 UTC
-    Issuer:         /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
-    Starts At:      2012-08-01 21:34 UTC
-    Subject:        /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
-    SSL certificate is self signed.
-  `
-}
+export const certificateDetails = `
+  Common Name(s): example.org
+  Expires At:     2013-08-01 21:34 UTC
+  Issuer:         /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
+  Starts At:      2012-08-01 21:34 UTC
+  Subject:        /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
+  SSL certificate is self signed.
+`
 
+export const certificateDetailsWithDomains = `
+  Common Name(s): example.org
+  Domain(s):      subdomain.example.com
+  Expires At:     2013-08-01 21:34 UTC
+  Issuer:         /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
+  Starts At:      2012-08-01 21:34 UTC
+  Subject:        /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
+  SSL certificate is self signed.
+`
+export const untrustedCertificateDetails = `
+  Common Name(s): example.org
+  Expires At:     2013-08-01 21:34 UTC
+  Issuer:         /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
+  Starts At:      2012-08-01 21:34 UTC
+  Subject:        /C=US/ST=California/L=San Francisco/O=Untrusted/CN=untrusted.example.org
+  SSL certificate is not trusted.
+`
 export const endpoint: Endpoint = {
   name: 'tokyo-1050',
   cname: 'tokyo-1050.herokussl.com',

diff --git a/packages/cli/test/unit/commands/certs/info.unit.test.ts b/packages/cli/test/unit/commands/certs/info.unit.test.ts
@@ -12,6 +12,7 @@ import {
   endpointTrusted,
   certificateDetails,
   certificateDetailsWithDomains,
+  untrustedCertificateDetails,
 } from '../../../helpers/stubs/sni-endpoints'
 const sharedSni = require('./shared_sni.unit.test.ts')
 
@@ -32,7 +33,7 @@ describe('heroku certs:info', function () {
     `))
     expectOutput(stdout.output, heredoc(`
       Certificate details:
-      ${certificateDetails()}
+      ${certificateDetails}
     `))
   })
 
@@ -60,7 +61,7 @@ describe('heroku certs:info', function () {
     ])
     expectOutput(stdout.output, heredoc(`
       Certificate details:
-      ${certificateDetailsWithDomains()}
+      ${certificateDetailsWithDomains}
     `))
   })
 
@@ -80,12 +81,7 @@ describe('heroku certs:info', function () {
     `))
     expectOutput(heredoc(stdout.output), heredoc(`
       Certificate details:
-      Common Name(s): example.org
-      Expires At:     2013-08-01 21:34 UTC
-      Issuer:         /C=US/ST=California/L=San Francisco/O=Heroku by Salesforce/CN=secure.example.org
-      Starts At:      2012-08-01 21:34 UTC
-      Subject:        /C=US/ST=California/L=San Francisco/O=Untrusted/CN=untrusted.example.org
-      SSL certificate is not trusted.
+      ${untrustedCertificateDetails}
     `))
   })
 
@@ -135,10 +131,10 @@ describe('heroku shared', function () {
     `)
   }
 
-  const stdout = function (certificateDetails: string) {
+  const stdout = function (certDetails: string) {
     return heredoc(`
-Certificate details:
-${certificateDetails}
+      Certificate details:
+      ${certDetails}
     `)
   }
 

diff --git a/packages/cli/test/unit/commands/certs/shared_sni.unit.test.ts b/packages/cli/test/unit/commands/certs/shared_sni.unit.test.ts
@@ -1,6 +1,5 @@
 import {stdout, stderr} from 'stdout-stderr'
 import runCommand, {GenericCmd} from '../../../helpers/runCommand'
-
 import * as nock from 'nock'
 import {expect} from 'chai'
 import {
@@ -39,7 +38,7 @@ export const shouldHandleArgs = function (commandText: string, command: GenericC
         'tokyo-1050',
       ])
       expectOutput(stderr.output, stderrOutput(endpoint))
-      expectOutput(stdout.output, stdoutOutput(certificateDetails(), endpoint))
+      expectOutput(stdout.output, stdoutOutput(certificateDetails, endpoint))
     })
 
     it('# errors out for --endpoint when there are multiple ', async function () {
@@ -68,7 +67,7 @@ export const shouldHandleArgs = function (commandText: string, command: GenericC
         'tokyo-1050.herokussl.com',
       ])
       expectOutput(stderr.output, stderrOutput(endpoint))
-      expectOutput(stdout.output, stdoutOutput(certificateDetails(), endpoint))
+      expectOutput(stdout.output, stdoutOutput(certificateDetails, endpoint))
     })
 
     it('# --endpoint errors out if there is no match', async function () {