Merge branch 'develop' of https://github.com/luckymarmot/API-Flow int…

…o JonathanMontane-fork

configs/node/api-flow-config.js

@@ -1,7 +1,7 @@
 import Environment from '../../src/environments/node/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
-import RAMLLoader from '../../src/loaders/raml/Loader'
+import RAMLV1Loader from '../../src/loaders/raml/Loader'
 import PostmanCollectionV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'

configs/web/api-flow-config.js

@@ -22,7 +22,7 @@ export const loaders = [
 export const parsers = [
   SwaggerV2Parser,
   RAMLV1Parser,
-  PostmanCollectionV2Parser
+  PostmanV2Parser
 ]
 
 export const serializers = [

src/serializers/paw/Serializer.js

@@ -1029,12 +1029,12 @@ methods.getContainerFromRequest = (request) => {
  * converts an auth into a DynamicString from a reference.
  * @param {Store} store: the store to use to resolve the reference
  * @param {Reference} reference: the reference to an EnvironmentVariable representing an Auth.
- * @returns {DynamicString} the corresponding DynamicString
+ * @returns {{ variable: DynamicString, auth: Auth }} the corresponding DynamicString
  */
 methods.convertAuthFromReference = (store, reference) => {
-  const variable = store.getIn([ 'auth', reference.get('uuid') ])
+  const { variable, auth } = store.getIn([ 'auth', reference.get('uuid') ])
   const ds = variable.createDynamicString()
-  return ds
+  return { variable: ds, auth: auth }
 }
 
 /**

src/serializers/paw/__tests__/Serializer.spec.js

@@ -2010,12 +2010,12 @@ describe('serializers/paw/Serializer.js', () => {
       spyOn(variable, 'createDynamicString').andReturn(123)
 
       const store = new Store({
-        auth: OrderedMap({ a: variable })
+        auth: OrderedMap({ a: { variable: variable, auth: 'my-auth' } })
       })
 
       const ref = new Reference({ uuid: 'a' })
 
-      const expected = 123
+      const expected = { auth: 'my-auth', variable: 123 }
       const actual = __internals__.convertAuthFromReference(store, ref)
 
       expect(actual).toEqual(expected)