fix some tests

2015-12-19 18:07:39 +01:00
parent ba22575e1a
commit 3e87c8d3e9
6 changed files with 101 additions and 106 deletions
@@ -7,17 +7,17 @@ import {
 describe('POST /group', () => {
  let user, api;

-   beforeEach(() => {
-     return generateUser().then((generatedUser) => {
-       user = generatedUser;
-       api = requester(user);
-     });
-   });
+  beforeEach(() => {
+    return generateUser().then((generatedUser) => {
+      user = generatedUser;
+      api = requester(user);
+    });
+  });

-   context('Guilds', () => {
+  context('Guilds', () => {
    it('returns an error when a user with insufficient funds attempts to create a guild', () => {
-      let groupName = "Test Public Guild";
-      let groupType = "guild";
+      let groupName = 'Test Public Guild';
+      let groupType = 'guild';

      return expect(
        api.post('/groups', {
@@ -32,99 +32,90 @@ describe('POST /group', () => {
      });
    });

-     context('public guild', () => {
-       it('creates a group', () => {
-         let groupName = "Test Public Guild";
-         let groupType = "guild";
-         let tmpUser;
+    context('public guild', () => {
+      it('creates a group', () => {
+        let groupName = 'Test Public Guild';
+        let groupType = 'guild';

-         return generateUser({balance: 1}).then((generatedUser) => {
-           tmpUser = generatedUser;
-           api = requester(tmpUser);
-           return api.post('/groups', {
-             name: groupName,
-             type: groupType
-           });
-         })
-         .then((result) => {
-           expect(result._id).to.exist;
-           expect(result.name).to.equal(groupName);
-           expect(result.type).to.equal(groupType);
-         })
-         .then(() => {
-           api = requester(user);
-         });
-       });
-     });
-
-     context('private guild', () => {
-       it('creates a group', () => {
-         let groupName = "Test Private Guild";
-         let groupType = "guild";
-         let groupPrivacy = "private";
-         let tmpUser;
-
-         return generateUser({balance: 1}).then((generatedUser) => {
-           tmpUser = generatedUser;
-           api = requester(tmpUser);
-           return api.post('/groups', {
-             name: groupName,
-             type: groupType,
-             privacy: groupPrivacy
-           });
-         })
-         .then((result) => {
-           expect(result._id).to.exist;
-           expect(result.name).to.equal(groupName);
-           expect(result.type).to.equal(groupType);
-           expect(result.privacy).to.equal(groupPrivacy);
-         })
-         .then(() => {
-           api = requester(tmpUser);
-         });
-       });
-     });
-   });
-
-   context('Parties', () => {
-     it('creates a party', () => {
-       let groupName = "Test Party";
-       let groupType = "party";
-
-       return api.post('/groups', {
-         name: groupName,
-         type: groupType
-       })
-       .then((result) => {
-         expect(result._id).to.exist;
-         expect(result.name).to.equal(groupName);
-         expect(result.type).to.equal(groupType);
-       })
-     });
-
-     it('prevents user in a party from creating a party', () => {
-        let tmpUser;
-        let groupName = "Test Party";
-        let groupType = "party";
-
-        return generateUser().then((generatedUser) => {
-          tmpUser = generatedUser;
-          api = requester(tmpUser);
-          return api.post('/groups', {
+        return generateUser({balance: 1}).then((generatedUser) => {
+          let api2 = requester(generatedUser);
+          return api2.post('/groups', {
            name: groupName,
            type: groupType
          });
        })
-        .then(() => {
-          return expect(api.post('/groups')).to.eventually.be.rejected.and.eql({
-            code: 401,
-            error: 'NotAuthorized',
-            message: t('messageGroupAlreadyInParty'),
-          });
-        })
-        .then(() => {
-          api = requester(user);
+        .then((result) => {
+          expect(result._id).to.exist;
+          expect(result.name).to.equal(groupName);
+          expect(result.type).to.equal(groupType);
        });
      });
-   });
+    });
+
+    context('private guild', () => {
+      it('creates a group', () => {
+        let groupName = 'Test Private Guild';
+        let groupType = 'guild';
+        let groupPrivacy = 'private';
+        let tmpUser;
+
+        return generateUser({balance: 1}).then((generatedUser) => {
+          let api2 = requester(generatedUser);
+          return api2.post('/groups', {
+            name: groupName,
+            type: groupType,
+            privacy: groupPrivacy
+          });
+        })
+        .then((result) => {
+          expect(result._id).to.exist;
+          expect(result.name).to.equal(groupName);
+          expect(result.type).to.equal(groupType);
+          expect(result.privacy).to.equal(groupPrivacy);
+        });
+      });
+    });
+  });
+
+  context('Parties', () => {
+    it('creates a party', () => {
+      let groupName = "Test Party";
+      let groupType = "party";
+
+      return api.post('/groups', {
+        name: groupName,
+        type: groupType
+      })
+      .then((result) => {
+        expect(result._id).to.exist;
+        expect(result.name).to.equal(groupName);
+        expect(result.type).to.equal(groupType);
+      })
+    });
+
+    it('prevents user in a party from creating a party', () => {
+      let tmpUser;
+      let groupName = "Test Party";
+      let groupType = "party";
+
+      return generateUser().then((generatedUser) => {
+        tmpUser = generatedUser;
+        api = requester(tmpUser);
+        return api.post('/groups', {
+          name: groupName,
+          type: groupType
+        });
+      })
+      .then(() => {
+        return expect(api.post('/groups')).to.eventually.be.rejected.and.eql({
+          code: 401,
+          error: 'NotAuthorized',
+          message: t('messageGroupAlreadyInParty'),
+        });
+      })
+      .then(() => {
+        api = requester(user);
+      });
+    });
+  });
 });