@@ -65,15 +65,15 @@ customOptions = defCommonGeneratorOptions {
6565
6666spec :: Spec
6767spec = describe "Servant.JQuery" $ do
68− (generateJSSpec Vanilla JS.generateVanillaJS)
69− (generateJSSpec VanillaCustom $ JS.generateVanillaJSWith customOptions)
70− (generateJSSpec JQuery JQ.generateJQueryJS)
71− (generateJSSpec JQueryCustom $ JQ.generateJQueryJSWith customOptions)
72− (generateJSSpec Angular $ NG.generateAngularJS NG.defAngularOptions)
73− (generateJSSpec AngularCustom $ (NG.generateAngularJSWith NG.defAngularOptions) customOptions)
68+ generateJSSpec Vanilla JS.generateVanillaJS
69+ generateJSSpec VanillaCustom (JS.generateVanillaJSWith customOptions)
70+ generateJSSpec JQuery JQ.generateJQueryJS
71+ generateJSSpec JQueryCustom (JQ.generateJQueryJSWith customOptions)
72+ generateJSSpec Angular (NG.generateAngularJS NG.defAngularOptions)
73+ generateJSSpec AngularCustom (NG.generateAngularJSWith NG.defAngularOptions customOptions)
7474
75− (angularSpec Angular)
76− (angularSpec AngularCustom)
75+ angularSpec Angular
76+ angularSpec AngularCustom
7777
7878angularSpec :: TestNames -> Spec
7979angularSpec test = describe specLabel $ do
@@ -143,11 +143,9 @@ generateJSSpec n gen = describe specLabel $ do
143143 parseFromString jsStr `shouldSatisfy` isRight
144144 where
145145 specLabel = "generateJS(" ++ (show n) ++ ")"
146− --output = print
147146 output _ = return ()
148147 genJS req = gen req
149148 header :: TestNames -> String -> String -> String
150149 header v headerName headerValue
151150 | v `elem` [Vanilla, VanillaCustom] = "xhr.setRequestHeader(\"" ++ headerName ++ "\", " ++ headerValue ++ ");\n"
152151 | otherwise = "headers: { \"" ++ headerName ++ "\": " ++ headerValue ++ " }\n"
153− --header _ _ _ = "Not Implemented"