move 'NoError' check to more appropriate position

purtuga · Feb 9, 2015 · 13a81b6 · 13a81b6
1 parent 7e88bfa
commit 13a81b6
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 3 deletions.
diff --git a/src/sputils/doesMsgHaveError.js b/src/sputils/doesMsgHaveError.js
@@ -14,7 +14,7 @@ define(["jquery"], function($){
             spErrCode   = $msg.find("ErrorCode"),
             response    = false;
 
-        if ( !spErrCode.length || spErrCode.text() === "NoError") {
+        if ( !spErrCode.length ) {
 
             if ( $msg.find("faultcode").length ) {
 
@@ -27,8 +27,8 @@ define(["jquery"], function($){
         }
 
         spErrCode.each(function(){
-
-            if ( $(this).text() !== "0x00000000" ) {
+			            
+            if ( $(this).text() !== "0x00000000" && $(this).text() !== "NoError" ) {
 
                 response = true;
                 return false;

diff --git a/test/server/login.operation.response.cannotBeNull.xml b/test/server/login.operation.response.cannotBeNull.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <soap:Body>
+        <soap:Fault>
+            <faultcode>soap:Server</faultcode>
+            <faultstring>Server was unable to process request. ---&gt; Value cannot be null.
+                Parameter name: userName
+            </faultstring>
+            <detail/>
+        </soap:Fault>
+    </soap:Body>
+</soap:Envelope>
diff --git a/test/server/login.operation.response.noError.xml b/test/server/login.operation.response.noError.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <soap:Body>
+        <LoginResponse xmlns="http://schemas.microsoft.com/sharepoint/soap/">
+            <LoginResult>
+                <CookieName>FedAuth</CookieName>
+                <ErrorCode>NoError</ErrorCode>
+                <TimeoutSeconds>1800</TimeoutSeconds>
+            </LoginResult>
+        </LoginResponse>
+    </soap:Body>
+</soap:Envelope>
diff --git a/test/server/login.operation.response.passwordNotMatch.xml b/test/server/login.operation.response.passwordNotMatch.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <soap:Body>
+        <LoginResponse xmlns="http://schemas.microsoft.com/sharepoint/soap/">
+            <LoginResult>
+                <ErrorCode>PasswordNotMatch</ErrorCode>
+                <TimeoutSeconds>0</TimeoutSeconds>
+            </LoginResult>
+        </LoginResponse>
+    </soap:Body>
+</soap:Envelope>