Merge pull request #37 from beckyconning/ready/attr-type-fix

Fixed attribute type bug

Author: beckyconning

src/Selenium.js

@@ -180,10 +180,20 @@ exports.getCssValue = function(el) {
     };
 };
 
-exports.getAttribute = function(el) {
-    return function(str) {
-        return function(cb, eb) {
-            return el.getAttribute(str).then(cb).thenCatch(eb);
+exports._getAttribute = function(nothing) {
+    return function(just) {
+        return function(el) {
+            return function(str) {
+                return function(cb, eb) {
+                    return el.getAttribute(str).then(function(attr) {
+                        if (attr === null) {
+                            cb(nothing);
+                        } else {
+                            cb(just(attr));
+                        }
+                    }).thenCatch(eb);
+                };
+            };
         };
     };
 };

src/Selenium.purs

@@ -145,7 +145,14 @@ foreign import executeStr :: forall e. Driver -> String -> Aff (selenium :: SELE
 foreign import sendKeysEl :: forall e. String -> Element -> Aff (selenium :: SELENIUM|e) Unit
 foreign import clickEl :: forall e. Element -> Aff (selenium :: SELENIUM|e) Unit
 foreign import getCssValue :: forall e. Element -> String -> Aff (selenium :: SELENIUM|e) String
-foreign import getAttribute :: forall e. Element -> String -> Aff (selenium :: SELENIUM|e) String
+foreign import _getAttribute :: forall e a. Maybe a -> (a -> Maybe a) ->
+                                Element -> String -> Aff (selenium :: SELENIUM|e) (Maybe String)
+
+-- | Tries to find an element starting from `document` will return `Nothing` if there
+-- | is no element can be found by locator
+getAttribute :: forall e. Element -> String -> Aff (selenium :: SELENIUM|e) (Maybe String)
+getAttribute = _getAttribute Nothing Just
+
 foreign import getText :: forall e. Element -> Aff (selenium :: SELENIUM|e) String
 foreign import isDisplayed :: forall e. Element -> Aff (selenium :: SELENIUM|e) Boolean
 foreign import isEnabled :: forall e. Element -> Aff (selenium :: SELENIUM|e) Boolean

src/Selenium/Monad.purs

@@ -152,7 +152,7 @@ isEnabled = lift <<< S.isEnabled
 getCssValue :: forall e o. Element -> String -> Selenium e o String
 getCssValue el key = lift $ S.getCssValue el key
 
-getAttribute :: forall e o. Element -> String -> Selenium e o String
+getAttribute :: forall e o. Element -> String -> Selenium e o (Maybe String)
 getAttribute el attr = lift $ S.getAttribute el attr
 
 getText :: forall e o. Element -> Selenium e o String