Sort out conflicts from develop

2015-07-12 13:51:42 -05:00
parent add35bc17c c0d35dc472
commit 316c3e9c2e
22 changed files with 328 additions and 117 deletions
@@ -574,6 +574,7 @@ describe 'User', ->
        expect(quest.value).to.be.greaterThan 0 if quest.canBuy
        expect(quest.drop.gp).to.not.be.lessThan 0
        expect(quest.drop.exp).to.not.be.lessThan 0
+        expect(quest.category).to.match(/pet|unlockable|gold|world/)
        if quest.drop.items
          expect(quest.drop.items).to.be.an(Array)
        if quest.boss