krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repair broken e2e test by changes in copy and IDs

Browse Source 
* Switch the "Play" button to check for "Play HabitRPG"

* Change "#register-tab" selector to use "#registrationForm"

* Increase delay when only running protractor specs, to ensure the server has
  time to spin up
This commit is contained in:
Kevin Gisi
2015-04-03 21:14:22 -04:00
parent 8033b129ff
commit 35866568da
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/dist/scripts/habitrpg-shared.js vendored
View File

@@ -2641,12 +2641,16 @@ api.spells = {
target: 'task', target: 'task',
notes: t('spellWizardFireballNotes'), notes: t('spellWizardFireballNotes'),
cast: function(user, target) { cast: function(user, target) {
var bonus; var bonus, req;
bonus = user._statsComputed.int * user.fns.crit('per'); bonus = user._statsComputed.int * user.fns.crit('per');
target.value += diminishingReturns(bonus * .02, 4); target.value += diminishingReturns(bonus * .02, 4);
bonus *= Math.ceil((target.value < 0 ? 1 : target.value + 1) * .075); bonus *= Math.ceil((target.value < 0 ? 1 : target.value + 1) * .075);
user.stats.exp += diminishingReturns(bonus, 75); user.stats.exp += diminishingReturns(bonus, 75);
return user.party.quest.progress.up += diminishingReturns(bonus * .1, 50, 30); user.party.quest.progress.up += diminishingReturns(bonus * .1, 50, 30);
req = {
language: user.preferences.language
};
return user.fns.updateStats(user.stats, req);
} }
}, },
mpheal: { mpheal: {
@@ -2772,12 +2776,16 @@ api.spells = {
target: 'task', target: 'task',
notes: t('spellRogueBackStabNotes'), notes: t('spellRogueBackStabNotes'),
cast: function(user, target) { cast: function(user, target) {
var bonus, _crit; var bonus, req, _crit;
_crit = user.fns.crit('str', .3); _crit = user.fns.crit('str', .3);
target.value += _crit * .03; target.value += _crit * .03;
bonus = (target.value < 0 ? 1 : target.value + 1) * _crit; bonus = (target.value < 0 ? 1 : target.value + 1) * _crit;
user.stats.exp += bonus; user.stats.exp += bonus;
return user.stats.gp += bonus; user.stats.gp += bonus;
req = {
language: user.preferences.language
};
return user.fns.updateStats(user.stats, req);
} }
}, },
toolsOfTrade: { toolsOfTrade: {

4
test/e2e/e2e.js
View File

@@ -25,7 +25,7 @@ describe('front page', function() {
it('shows the front page', function(){ it('shows the front page', function(){
var button = element(by.className('btn')); var button = element(by.className('btn'));
expect(button.getText()).toEqual('Play'); expect(button.getText()).toEqual('Play HabitRPG');
}); });
it("don't login when using wrong credentials", function(){ it("don't login when using wrong credentials", function(){
@@ -51,7 +51,7 @@ describe('front page', function() {
element(by.model('registerVals.email')).sendKeys('user@example.com'); element(by.model('registerVals.email')).sendKeys('user@example.com');
element(by.model('registerVals.password')).sendKeys('pass'); element(by.model('registerVals.password')).sendKeys('pass');
element(by.model('registerVals.confirmPassword')).sendKeys('pass'); element(by.model('registerVals.confirmPassword')).sendKeys('pass');
var register = element(by.css("#register-tab input[value='Register']")); var register = element(by.css("#registrationForm input[value='Register']"));
register.click(); register.click();
browser.sleep(1000); browser.sleep(1000);
browser.getCurrentUrl().then(function(url){ browser.getCurrentUrl().then(function(url){

2
test/run_tests.sh
View File

@@ -48,7 +48,7 @@ fi
# If we're only running protractor, we need to let the server spin up. # If we're only running protractor, we need to let the server spin up.
if [ "$1" == "protractor" ]; then if [ "$1" == "protractor" ]; then
sleep 2 sleep 10
fi fi
if [ -z "$TRAVIS" ]; then if [ -z "$TRAVIS" ]; then