From 0736f848cb19778b980fe93ef428c4cc2957efde Mon Sep 17 00:00:00 2001
From: spacejack <spacejack@gmail.com>
Date: Sat, 28 Oct 2017 17:39:32 -0400
Subject: [PATCH 1/2] Silence global-require rule in ospec, add ecma 2017
 parser to eslintrc for async/await in test-ospec

---
 .eslintrc.js   | 5 ++++-
 ospec/ospec.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c14d0119..4eeef493 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -4,7 +4,10 @@ module.exports = {
         "commonjs": true,
         "es6": true,
         "node": true
-    },
+	},
+	"parserOptions": {
+		"ecmaVersion": 2017,
+	},
     "extends": "eslint:recommended",
     "rules": {
         "accessor-pairs": "error",
diff --git a/ospec/ospec.js b/ospec/ospec.js
index 147e2dc4..fabf4de8 100644
--- a/ospec/ospec.js
+++ b/ospec/ospec.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-bitwise, no-process-exit */
+/* eslint-disable global-require, no-bitwise, no-process-exit */
 "use strict"
 
 module.exports = new function init(name) {

From 3fe56bb503edbac9eb8dbb6e7e5a80f4491a068f Mon Sep 17 00:00:00 2001
From: spacejack <spacejack@gmail.com>
Date: Sat, 28 Oct 2017 18:32:58 -0400
Subject: [PATCH 2/2] Revert eslintrc change, return Promise instead of using
 async/await

---
 .eslintrc.js              | 3 ---
 ospec/tests/test-ospec.js | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 4eeef493..a38c5e1b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -5,9 +5,6 @@ module.exports = {
         "es6": true,
         "node": true
 	},
-	"parserOptions": {
-		"ecmaVersion": 2017,
-	},
     "extends": "eslint:recommended",
     "rules": {
         "accessor-pairs": "error",
diff --git a/ospec/tests/test-ospec.js b/ospec/tests/test-ospec.js
index 69f2e1f1..d1ddf496 100644
--- a/ospec/tests/test-ospec.js
+++ b/ospec/tests/test-ospec.js
@@ -188,8 +188,8 @@ o.spec("ospec", function() {
 			})
 		})
 
-		o("promise functions", async function() {
-			await wrapPromise(function() {
+		o("promise functions", function() {
+			return wrapPromise(function() {
 				o(a).equals(b)
 				o(a).equals(1)("a and b should be initialized")
 			})