Make tests succeed again

Author: Dan Fithian

openapi3-code-generator/src/OpenAPI/Generate/Main.hs

@@ -82,7 +82,7 @@ defineModels moduleName spec operationDependencies =
           whiteListedSchemas <- OAM.getSetting OAO.settingWhiteListedSchemas
           outputAllSchemas <- OAM.getSetting OAO.settingOutputAllSchemas
           let dependencies = Set.union operationDependencies $ Set.fromList $ fmap transformToModuleName whiteListedSchemas
-          pure $ Dep.getModelModulesFromModelsWithDependencies moduleName dependencies models outputAllSchemas
+          pure $ Dep.getModelModulesFromModelsWithDependencies moduleName dependencies outputAllSchemas models
 
 -- | Defines all supported security schemes from the 'OAT.OpenApiSpecification'.
 defineSecuritySchemes :: String -> OAT.OpenApiSpecification -> OAM.Generator (Q Doc)

openapi3-code-generator/src/OpenAPI/Generate/ModelDependencies.hs

@@ -38,8 +38,8 @@ typesModule = "Types"
 
 -- | Analyzes the dependencies of the provided models and splits them into modules.
 -- All models which would form an own module but only consist of a type alias are put in a module named by 'Doc.typeAliasModule'.
-getModelModulesFromModelsWithDependencies :: String -> Models -> [ModelWithDependencies] -> Bool -> Q [ModuleDefinition]
-getModelModulesFromModelsWithDependencies mainModuleName operationAndWhiteListDependencies models outputAllSchemas = do
+getModelModulesFromModelsWithDependencies :: String -> Models -> Bool -> [ModelWithDependencies] -> Q [ModuleDefinition]
+getModelModulesFromModelsWithDependencies mainModuleName operationAndWhiteListDependencies outputAllSchemas models = do
   let modelsToGenerate =
         if outputAllSchemas
           then models

openapi3-code-generator/test/OpenAPI/Generate/ModelDependenciesSpec.hs

@@ -14,7 +14,7 @@ import Test.Hspec
 spec :: Spec
 spec =
   describe "getModelModulesFromModelsWithDependencies" $ do
-    let sut = getModelModulesFromModelsWithDependencies "OpenAPI" (Set.fromList ["A", "B", "C", "D", "E", "F", "G"])
+    let sut = getModelModulesFromModelsWithDependencies "OpenAPI" (Set.fromList ["A", "B", "C", "D", "E", "F", "G"]) False
         t = pure . text
     it "should split string into pieces" $ do
       result <-