Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

Author: hhyu1

test/common/security/SecurityManagerSpec.js

@@ -2,6 +2,7 @@ import { SecurityManager } from '../../../src/common/security/SecurityManager';
 import { ServerInfo } from '../../../src/common/security/ServerInfo';
 import { TokenServiceParameter } from '../../../src/common/security/TokenServiceParameter';
 import { ServerType } from '../../../src/common/REST';
+import {FetchRequest} from '../../../src/common/util/FetchRequest';
 
 describe('SecurityManager', () => {
     var originalTimeout;
@@ -80,13 +81,20 @@ describe('SecurityManager', () => {
     });
 
     it('loginOnline', () => {
+        spyOn(window, 'open').and.callFake(()=>{});
         var callbackLocation = 'Online';
         var newTab = false;
         SecurityManager.loginOnline(callbackLocation, newTab);
+        expect(window.open).toHaveBeenCalled();
     });
 
     it('loginiPortal', () => {
-        var url = 'http://localhost:8092';
+        spyOn(FetchRequest, 'post').and.callFake((testUrl, params, options) => {
+            expect(testUrl).toBe("http://fakeiportal/web/login");
+            expect(params).not.toBeNull();
+            return Promise.resolve(new Response(`{"succeed":true}`));
+        });
+        var url = 'http://fakeiportal';
         SecurityManager.loginiPortal(url, 'admin', 'admin');
     });
 

test/karma.conf.js

@@ -55,7 +55,7 @@ module.exports = function (config) {
       /***测试文件***/
       './tool/**.js',
       './resources/**.js',
-      './resources/img/**.png',
+      // './resources/img/**.png',
       /***classic的源码***/
       /*由于除了classic其他都不依赖于8c,所以classic 的引入放在最后，以免被common覆盖*/
       { pattern: '../src/classic/libs/SuperMap_Basic-8.1.1-17729.js', include: false },