Merge branch 'main' into early-access-tweaks

whatdon · Dec 10, 2020 · 82ad16c · 82ad16c
2 parents 41a4732 + a97698f
commit 82ad16c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/content/developers/webhooks-and-events/webhook-events-and-payloads.md b/content/developers/webhooks-and-events/webhook-events-and-payloads.md
@@ -445,7 +445,7 @@ Key | Type | Description
 #### Webhook payload object
 
 {% data reusables.webhooks.installation_properties %}
-{% data reusables.webhooks.app_desc %}
+{% data reusables.webhooks.app_always_desc %}
 {% data reusables.webhooks.sender_desc %}
 
 #### Webhook payload example
@@ -469,7 +469,7 @@ Key | Type | Description
 #### Webhook payload object
 
 {% data reusables.webhooks.installation_repositories_properties %}
-{% data reusables.webhooks.app_desc %}
+{% data reusables.webhooks.app_always_desc %}
 {% data reusables.webhooks.sender_desc %}
 
 #### Webhook payload example

diff --git a/data/reusables/webhooks/app_always_desc.md b/data/reusables/webhooks/app_always_desc.md
@@ -0,0 +1 @@
+`installation` | `object` | The {% data variables.product.prodname_github_app %} installation.
diff --git a/tests/helpers/conditional-runs.js b/tests/helpers/conditional-runs.js
@@ -0,0 +1,9 @@
+const runningActionsOnInternalRepo = process.env.GITHUB_ACTIONS === 'true' && process.env.GITHUB_REPOSITORY === 'github/docs-internal'
+
+const testViaActionsOnly = runningActionsOnInternalRepo ? test : test.skip
+const describeViaActionsOnly = runningActionsOnInternalRepo ? describe : describe.skip
+
+module.exports = {
+  testViaActionsOnly,
+  describeViaActionsOnly
+}
diff --git a/tests/rendering/server.js b/tests/rendering/server.js
@@ -1,6 +1,7 @@
 const lodash = require('lodash')
 const enterpriseServerReleases = require('../../lib/enterprise-server-releases')
 const { get, getDOM, head } = require('../helpers/supertest')
+const { describeViaActionsOnly } = require('../helpers/conditional-runs')
 const path = require('path')
 const nonEnterpriseDefaultVersion = require('../../lib/non-enterprise-default-version')
 const { loadPages } = require('../../lib/pages')
@@ -356,7 +357,7 @@ describe('server', () => {
     })
   })
 
-  describe.skip('Early Access articles', () => {
+  describeViaActionsOnly('Early Access articles', () => {
     let hiddenPageHrefs, hiddenPages
 
     beforeAll(async (done) => {

diff --git a/tests/unit/early-access.js b/tests/unit/early-access.js
@@ -1,9 +1,6 @@
 const fs = require('fs').promises
 const path = require('path')
-
-const { GITHUB_ACTIONS, GITHUB_REPOSITORY } = process.env
-const runningActionsOnInternalRepo = GITHUB_ACTIONS === 'true' && GITHUB_REPOSITORY === 'github/docs-internal'
-const testViaActionsOnly = runningActionsOnInternalRepo ? test : test.skip
+const { testViaActionsOnly } = require('../helpers/conditional-runs')
 
 describe('cloning early-access', () => {
   testViaActionsOnly('the content directory exists', async () => {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		`installation` \| `object` \| The {% data variables.product.prodname_github_app %} installation.