Merge branch 'master' of https://github.com/SuperMap/iClient9

zhurc · zhurc · commit 8b252fabc7ae · 2018-01-04T16:46:51.000+08:00
diff --git a/test/openlayers/services/ThemeServiceSpec.js b/test/openlayers/services/ThemeServiceSpec.js
@@ -285,7 +285,7 @@ describe('openlayers_ThemeService', function () {
                 expect(false).toBeTruthy();
                 done();
             }
-        }, 8000)
+        }, 20000)
     });
 
     //标签专题图

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ describe('openlayers_ThemeService', function () {`
`285`	`285`	`expect(false).toBeTruthy();`
`286`	`286`	`done();`
`287`	`287`	`}`
`288`		`- }, 8000)`
	`288`	`+ }, 20000)`
`289`	`289`	`});`
`290`	`290`
`291`	`291`	`//标签专题图`