Merge pull request #8 from technote-space/release/v0.0.10

release/v0.0.10
technote-space · Sep 26, 2019 · 4027d3e · 4027d3e
2 parents b410999 + c2a7e8c
commit 4027d3e
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 19 deletions.
diff --git a/README.ja.md b/README.ja.md
@@ -26,6 +26,7 @@ GitHub Action 用テストヘルパー
 ```js
 import {
 	getContext,
+	generateContext,
 	encodeContent,
 	getConfigFixture,
 	getApiFixture,
@@ -44,6 +45,7 @@ import {
 import nock from 'nock';
 
 getContext({});
+generateContext({});
 encodeContent('content');
 getConfigFixture('rootDir', 'fileName');
 getApiFixture('rootDir', 'name');

diff --git a/README.md b/README.md
@@ -26,6 +26,7 @@ Test helper for GitHub Action.
 ```js
 import {
 	getContext,
+	generateContext,
 	encodeContent,
 	getConfigFixture,
 	getApiFixture,
@@ -44,6 +45,7 @@ import {
 import nock from 'nock';
 
 getContext({});
+generateContext({});
 encodeContent('content');
 getConfigFixture('rootDir', 'fileName');
 getApiFixture('rootDir', 'name');

diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -70,6 +70,11 @@ describe('generateContext', () => {
 				owner: 'override-owner',
 				repo: 'override-repo',
 			},
+			payload: {
+				release: {
+					'tag_name': 'test-tag',
+				},
+			},
 		});
 		expect(context.eventName).toBe('override-event');
 		expect(context.payload.action).toBe('test-action');
@@ -79,6 +84,7 @@ describe('generateContext', () => {
 		expect(context.repo.owner).toBe('override-owner');
 		expect(context.issue.repo).toBe('test-repo');
 		expect(context.repo.repo).toBe('override-repo');
+		expect(context.payload.release.tag_name).toBe('test-tag');
 	});
 });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/github-action-test-helper",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Test helper for GitHub Action.",
   "author": "Technote <technote.space@gmail.com> (https://technote.space)",
   "license": "MIT",

diff --git a/src/context.ts b/src/context.ts
@@ -22,24 +22,29 @@ export const getContext = (override: object): Context => Object.assign({
 	},
 }, override);
 
-export const generateContext = (settings: { event?: string; action?: string; ref?: string; sha?: string; owner?: string; repo?: string }, override?: object): Context => getContext(
-	Object.assign({
-		eventName: settings.event ? settings.event : '',
-		payload: {
-			action: settings.action ? settings.action : '',
-		},
-		ref: settings.ref ? `refs/${settings.ref}` : '',
-		sha: settings.sha ? settings.sha : '',
-		issue: {
-			owner: settings.owner ? settings.owner : '',
-			repo: settings.repo ? settings.repo : '',
-		},
-		repo: {
-			owner: settings.owner ? settings.owner : '',
-			repo: settings.repo ? settings.repo : '',
-		},
-	}, override || {}),
-);
+export const generateContext = (settings: { event?: string; action?: string; ref?: string; sha?: string; owner?: string; repo?: string }, override?: object): Context => {
+	const overrideObj = override || {};
+
+	return getContext(
+		Object.assign({}, {
+			eventName: settings.event ? settings.event : '',
+			ref: settings.ref ? `refs/${settings.ref}` : '',
+			sha: settings.sha ? settings.sha : '',
+		}, overrideObj, {
+			payload: Object.assign({
+				action: settings.action ? settings.action : '',
+			}, overrideObj['payload'] || {}),
+			issue: Object.assign({
+				owner: settings.owner ? settings.owner : '',
+				repo: settings.repo ? settings.repo : '',
+			}, overrideObj['issue'] || {}),
+			repo: Object.assign({
+				owner: settings.owner ? settings.owner : '',
+				repo: settings.repo ? settings.repo : '',
+			}, overrideObj['repo'] || {}),
+		}),
+	);
+};
 
 type CreateResponseFunctionType = <T>(data: T, override?: object) => Response<T>;
 export const createResponse: CreateResponseFunctionType = (data, override = {}) => Object.assign({