git.iko.soy/servant
on master help sign in
servant-js testsuite code cleanup
d3fa61cAlp Mestanogullari
servant-js/test/Servant/JSSpec.hs+8−10
compare with master
unifiedsplit
@@ -65,15 +65,15 @@ customOptions = defCommonGeneratorOptions {
65
65
66spec :: Spec
66spec :: Spec
67spec = describe "Servant.JQuery" $ do
67spec = describe "Servant.JQuery" $ do
68− (generateJSSpec Vanilla JS.generateVanillaJS)
68+ generateJSSpec Vanilla JS.generateVanillaJS
69− (generateJSSpec VanillaCustom $ JS.generateVanillaJSWith customOptions)
69+ generateJSSpec VanillaCustom (JS.generateVanillaJSWith customOptions)
70− (generateJSSpec JQuery JQ.generateJQueryJS)
70+ generateJSSpec JQuery JQ.generateJQueryJS
71− (generateJSSpec JQueryCustom $ JQ.generateJQueryJSWith customOptions)
71+ generateJSSpec JQueryCustom (JQ.generateJQueryJSWith customOptions)
72− (generateJSSpec Angular $ NG.generateAngularJS NG.defAngularOptions)
72+ generateJSSpec Angular (NG.generateAngularJS NG.defAngularOptions)
73− (generateJSSpec AngularCustom $ (NG.generateAngularJSWith NG.defAngularOptions) customOptions)
73+ generateJSSpec AngularCustom (NG.generateAngularJSWith NG.defAngularOptions customOptions)
74
74
75− (angularSpec Angular)
75+ angularSpec Angular
76− (angularSpec AngularCustom)
76+ angularSpec AngularCustom
77
77
78angularSpec :: TestNames -> Spec
78angularSpec :: TestNames -> Spec
79angularSpec test = describe specLabel $ do
79angularSpec test = describe specLabel $ do
@@ -143,11 +143,9 @@ generateJSSpec n gen = describe specLabel $ do
143 parseFromString jsStr `shouldSatisfy` isRight
143 parseFromString jsStr `shouldSatisfy` isRight
144 where
144 where
145 specLabel = "generateJS(" ++ (show n) ++ ")"
145 specLabel = "generateJS(" ++ (show n) ++ ")"
146− --output = print
147 output _ = return ()
146 output _ = return ()
148 genJS req = gen req
147 genJS req = gen req
149 header :: TestNames -> String -> String -> String
148 header :: TestNames -> String -> String -> String
150 header v headerName headerValue
149 header v headerName headerValue
151 | v `elem` [Vanilla, VanillaCustom] = "xhr.setRequestHeader(\"" ++ headerName ++ "\", " ++ headerValue ++ ");\n"
150 | v `elem` [Vanilla, VanillaCustom] = "xhr.setRequestHeader(\"" ++ headerName ++ "\", " ++ headerValue ++ ");\n"
152 | otherwise = "headers: { \"" ++ headerName ++ "\": " ++ headerValue ++ " }\n"
151 | otherwise = "headers: { \"" ++ headerName ++ "\": " ++ headerValue ++ " }\n"
153− --header _ _ _ = "Not Implemented"