From bb57fd2406716fbffff418015f2ae2fa75599b0f Mon Sep 17 00:00:00 2001
From: Kyle Shockey <shockey@users.noreply.github.com>
Date: Thu, 30 Nov 2017 20:11:30 -0800
Subject: [PATCH] Send server variables to Client as JS objects

---
 src/core/plugins/spec/actions.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/core/plugins/spec/actions.js b/src/core/plugins/spec/actions.js
index f47b09ef..5e6f51fc 100644
--- a/src/core/plugins/spec/actions.js
+++ b/src/core/plugins/spec/actions.js
@@ -232,13 +232,13 @@ export const executeRequest = (req) =>
 
       req.server = oas3Selectors.selectedServer(namespace) || oas3Selectors.selectedServer()
 
-      const operationVariables = oas3Selectors.serverVariables({
+      const namespaceVariables = oas3Selectors.serverVariables({
         server: req.server,
         namespace
-      })
-      const globalVariables = oas3Selectors.serverVariables({ server: req.server })
-      
-      req.serverVariables = operationVariables.size ? operationVariables : globalVariables
+      }).toJS()
+      const globalVariables = oas3Selectors.serverVariables({ server: req.server }).toJS()
+
+      req.serverVariables = Object.keys(namespaceVariables).length ? namespaceVariables : globalVariables
 
       req.requestContentType = oas3Selectors.requestContentType(pathName, method)
       req.responseContentType = oas3Selectors.responseContentType(pathName, method) || "*/*"