fix tests - unpin items on purchasing eggs / hatchingPotions

HabitRPG · Aug 20, 2017 · 2efae83 · 2efae83
1 parent ec2c934
commit 2efae83
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/website/client/components/tasks/user.vue b/website/client/components/tasks/user.vue
@@ -476,12 +476,10 @@ export default {
     buyItem (item) {
       if (item.purchaseType === 'card') {
         this.selectedCardToBuy = item;
+      } else if (item.currency === 'gold') {
+        this.$store.dispatch('shops:buyItem', {key: item.key});
       } else {
-        if (item.currency === 'gold') {
-          this.$store.dispatch('shops:buyItem', {key: item.key});
-        } else {
-          this.$store.dispatch('shops:purchase', {type: item.purchaseType, key: item.key});
-        }
+        this.$store.dispatch('shops:purchase', {type: item.purchaseType, key: item.key});
       }
     },
     openBuyDialog (rewardItem) {

diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js
@@ -71,6 +71,7 @@ api.bundles = {
       return moment().isBetween('2017-05-16', '2017-05-31');
     },
     type: 'quests',
+    class: 'quest_bundle_featheredFriends',
     value: 7,
   },
   splashyPals: {
@@ -86,6 +87,7 @@ api.bundles = {
       return moment().isBetween('2017-07-11', '2017-08-02');
     },
     type: 'quests',
+    class: 'quest_bundle_splashyPals',
     value: 7,
   },
 };

diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js
@@ -5,7 +5,7 @@ const featuredItems = {
       path: 'armoire',
     },
     {
-      type: 'hatchingPotion',
+      type: 'hatchingPotions',
       path: 'hatchingPotions.Golden',
     },
     {

diff --git a/website/common/script/libs/getItemInfo.js b/website/common/script/libs/getItemInfo.js
@@ -44,7 +44,7 @@ module.exports = function getItemInfo (user, type, item, language = 'en') {
   let itemInfo;
 
   switch (type) {
-    case 'egg':
+    case 'eggs':
       itemInfo = {
         key: item.key,
         text: i18n.t('egg', {eggType: item.text(language)}, language),
@@ -55,10 +55,10 @@ module.exports = function getItemInfo (user, type, item, language = 'en') {
         currency: 'gems',
         purchaseType: 'eggs',
         path: `eggs.${item.key}`,
-        pinType: 'egg',
+        pinType: 'eggs',
       };
       break;
-    case 'hatchingPotion':
+    case 'hatchingPotions':
       itemInfo = {
         key: item.key,
         text: i18n.t('potion', {potionType: item.text(language)}),
@@ -69,7 +69,7 @@ module.exports = function getItemInfo (user, type, item, language = 'en') {
         currency: 'gems',
         purchaseType: 'hatchingPotions',
         path: `hatchingPotions.${item.key}`,
-        pinType: 'hatchingPotion',
+        pinType: 'hatchingPotions',
       };
       break;
     case 'premiumHatchingPotion':
@@ -100,17 +100,17 @@ module.exports = function getItemInfo (user, type, item, language = 'en') {
         pinType: 'food',
       };
       break;
-    case 'questBundle':
+    case 'bundles':
       itemInfo = {
         key: item.key,
         text: item.text(language),
         notes: item.notes(language),
         value: item.value,
         currency: 'gems',
-        class: `quest_bundle_${item.key}`,
+        class: item.class,
         purchaseType: 'bundles',
         path: `bundles.${item.key}`,
-        pinType: 'questBundle',
+        pinType: 'bundles',
       };
       break;
     case 'quests': // eslint-disable-line no-case-declarations

diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js
@@ -24,7 +24,7 @@ shops.getMarketCategories = function getMarket (user, language) {
     .filter(egg => egg.canBuy(user))
     .concat(values(content.dropEggs))
     .map(egg => {
-      return getItemInfo(user, 'egg', egg, language);
+      return getItemInfo(user, 'eggs', egg, language);
     }), 'key');
   categories.push(eggsCategory);
 
@@ -36,7 +36,7 @@ shops.getMarketCategories = function getMarket (user, language) {
   hatchingPotionsCategory.items = sortBy(values(content.hatchingPotions)
     .filter(hp => !hp.limited)
     .map(hatchingPotion => {
-      return getItemInfo(user, 'hatchingPotion', hatchingPotion, language);
+      return getItemInfo(user, 'hatchingPotions', hatchingPotion, language);
     }), 'key');
   categories.push(hatchingPotionsCategory);
 
@@ -134,7 +134,7 @@ shops.getQuestShopCategories = function getQuestShopCategories (user, language)
   bundleCategory.items = sortBy(values(content.bundles)
     .filter(bundle => bundle.type === 'quests' && bundle.canBuy())
     .map(bundle => {
-      return getItemInfo(user, 'questBundle', bundle, language);
+      return getItemInfo(user, 'bundles', bundle, language);
     }));
 
   if (bundleCategory.items.length > 0) {