From d3fa61c04103404b7e8bda21d96045ca3dac4e5f Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Thu, 23 Jul 2015 13:47:44 +0200 Subject: [PATCH] servant-js testsuite code cleanup --- servant-js/test/Servant/JSSpec.hs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/servant-js/test/Servant/JSSpec.hs b/servant-js/test/Servant/JSSpec.hs index 0025f3b7..5ff60f9a 100644 --- a/servant-js/test/Servant/JSSpec.hs +++ b/servant-js/test/Servant/JSSpec.hs @@ -65,15 +65,15 @@ customOptions = defCommonGeneratorOptions { spec :: Spec spec = describe "Servant.JQuery" $ do - (generateJSSpec Vanilla JS.generateVanillaJS) - (generateJSSpec VanillaCustom $ JS.generateVanillaJSWith customOptions) - (generateJSSpec JQuery JQ.generateJQueryJS) - (generateJSSpec JQueryCustom $ JQ.generateJQueryJSWith customOptions) - (generateJSSpec Angular $ NG.generateAngularJS NG.defAngularOptions) - (generateJSSpec AngularCustom $ (NG.generateAngularJSWith NG.defAngularOptions) customOptions) + generateJSSpec Vanilla JS.generateVanillaJS + generateJSSpec VanillaCustom (JS.generateVanillaJSWith customOptions) + generateJSSpec JQuery JQ.generateJQueryJS + generateJSSpec JQueryCustom (JQ.generateJQueryJSWith customOptions) + generateJSSpec Angular (NG.generateAngularJS NG.defAngularOptions) + generateJSSpec AngularCustom (NG.generateAngularJSWith NG.defAngularOptions customOptions) - (angularSpec Angular) - (angularSpec AngularCustom) + angularSpec Angular + angularSpec AngularCustom angularSpec :: TestNames -> Spec angularSpec test = describe specLabel $ do @@ -143,11 +143,9 @@ generateJSSpec n gen = describe specLabel $ do parseFromString jsStr `shouldSatisfy` isRight where specLabel = "generateJS(" ++ (show n) ++ ")" - --output = print output _ = return () genJS req = gen req header :: TestNames -> String -> String -> String header v headerName headerValue | v `elem` [Vanilla, VanillaCustom] = "xhr.setRequestHeader(\"" ++ headerName ++ "\", " ++ headerValue ++ ");\n" | otherwise = "headers: { \"" ++ headerName ++ "\": " ++ headerValue ++ " }\n" - --header _ _ _ = "Not Implemented"