diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json index 9c68a31979..44f5a3f692 100644 --- a/common/locales/en/subscriber.json +++ b/common/locales/en/subscriber.json @@ -62,7 +62,7 @@ "timeTravelersPopoverNoSub": "You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <%= linkStart %>Subscribers<%= linkEnd %> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a rare pet, mount, or Subscriber Item Set from the past... or maybe even the future.", "timeTravelersPopover": "We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the pet, mount, or Mystery Item Set you would like. You can see a list of the past item sets <%= linkStart %>here<%= linkEnd %>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?", "timeTravelersAlreadyOwned": "Congratulations! You already own everything the Time Travelers currently offer. Thanks for supporting the site!", - "mysticHourglassPopover": "Mystic Hourglass allows you to purchase previous months' subscriber sets.", + "mysticHourglassPopover": "A Mystic Hourglass allows you to purchase certain limited-time items, such as monthly Mystery Item Sets and awards from world bosses, from the past!", "subUpdateCard": "Update Card", "subUpdateTitle": "Update", "subUpdateDescription": "Update the card to be charged.", diff --git a/common/script/content/index.coffee b/common/script/content/index.coffee index 35c520f773..b2ef3a9798 100644 --- a/common/script/content/index.coffee +++ b/common/script/content/index.coffee @@ -27,7 +27,7 @@ events = winter2015: {start:'2014-12-21',end:'2015-02-02'} spring2015: {start:'2015-03-20',end:'2015-05-02'} summer2015: {start:'2015-06-20',end:'2015-08-02'} - fall2015: {start:'2015-09-17',end:'2015-11-01'} + fall2015: {start:'2015-09-21',end:'2015-11-01'} api.mystery = 201402: {start:'2014-02-22',end:'2014-02-28', text:'Winged Messenger Set'} diff --git a/test/spec/controllers/inventoryCtrlSpec.js b/test/spec/controllers/inventoryCtrlSpec.js index 5b484ac6f8..4e2c95b747 100644 --- a/test/spec/controllers/inventoryCtrlSpec.js +++ b/test/spec/controllers/inventoryCtrlSpec.js @@ -229,17 +229,17 @@ describe('Inventory Controller', function() { }); it('returns true if there are no items left to purchase', inject(function(Content) { - for (var item in Content.gear.flat) { + _.forEach(Content.gear.flat, function(v,item) { if (item.indexOf('mystery') > -1) { user.items.gear.owned[item] = true; } - } - for (var pet in Content.timeTravelStable.pets) { + }); + _.forEach(Content.timeTravelStable.pets, function(v,pet) { user.items.pets[pet] = 5; - } - for (var mount in Content.timeTravelStable.mounts) { + }); + _.forEach(Content.timeTravelStable.mounts, function(v,mount) { user.items.mounts[mount] = true; - } + }); expect(scope.hasAllTimeTravelerItems()).to.eql(true); })); @@ -251,11 +251,11 @@ describe('Inventory Controller', function() { }); it('returns true for Mystery Sets if there are no sets left to purchase', inject(function(Content) { - for (var item in Content.gear.flat) { + _.forEach(Content.gear.flat, function(v,item) { if (item.indexOf('mystery') > -1) { user.items.gear.owned[item] = true; } - } + }); expect(scope.hasAllTimeTravelerItemsOfType('mystery')).to.eql(true); })); @@ -265,9 +265,9 @@ describe('Inventory Controller', function() { }); it('returns true for pets if user owns all pets in the Time Travel Stable', inject(function(Content) { - for (var pet in Content.timeTravelStable.pets) { + _.forEach(Content.timeTravelStable.pets, function(v,pet) { user.items.pets[pet] = 5; - } + }); expect(scope.hasAllTimeTravelerItemsOfType('pets')).to.eql(true); })); @@ -277,9 +277,9 @@ describe('Inventory Controller', function() { }); it('returns true for mounts if user owns all mounts in the Time Travel Stable', inject(function(Content) { - for (var mount in Content.timeTravelStable.mounts) { + _.forEach(Content.timeTravelStable.mounts, function(v,mount) { user.items.mounts[mount] = true; - } + }); expect(scope.hasAllTimeTravelerItemsOfType('mounts')).to.eql(true); }));