Przeglądaj źródła

Fix test case finnally

afc163 8 lat temu
rodzic
commit
9666d03bc4

+ 4 - 4
src/components/Authorized/CheckPermissions.js

@@ -16,15 +16,15 @@ const checkPermissions = (authority, currentAuthority, target, Exception) => {
     return target;
   }
   // 数组处理
-  if (authority.constructor.name === 'Array') {
-    if (authority.includes(currentAuthority)) {
+  if (Array.isArray(authority)) {
+    if (authority.indexOf(currentAuthority) >= 0) {
       return target;
     }
     return Exception;
   }
 
   // string 处理
-  if (authority.constructor.name === 'String') {
+  if (typeof authority === 'string') {
     if (authority === currentAuthority) {
       return target;
     }
@@ -39,7 +39,7 @@ const checkPermissions = (authority, currentAuthority, target, Exception) => {
   }
 
   // Function 处理
-  if (authority.constructor.name === 'Function') {
+  if (typeof authority === 'function') {
     try {
       const bool = authority();
       if (bool) {

+ 9 - 0
src/e2e/home.e2e.js

@@ -0,0 +1,9 @@
+import Nightmare from 'nightmare';
+
+describe('Homepage', () => {
+  it('it should have logo text', async () => {
+    const page = Nightmare().goto('http://localhost:8000');
+    const text = await page.wait('h1').evaluate(() => document.body.innerHTML).end();
+    expect(text).toContain('<h1>Ant Design Pro</h1>');
+  });
+});

+ 6 - 1
src/e2e/login.e2e.js

@@ -4,7 +4,12 @@ describe('Login', () => {
   let page;
   beforeEach(() => {
     page = Nightmare();
-    page.goto('http://localhost:8000/#/user/login');
+    page
+      .goto('http://localhost:8000/')
+      .evaluate(() => {
+        window.localStorage.setItem('antd-pro-authority', 'guest');
+      })
+      .goto('http://localhost:8000/#/user/login');
   });
 
   it('should login with failure', async () => {