mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00
Code Issues Releases Wiki Activity

[ticket/9758] Adds id and changes filter to fix travis CI test

Browse Source 
PHPBB3-9758
This commit is contained in:
Crizzo
2014-03-24 20:57:25 +01:00
parent d48d47c916
commit 9568181b98
3 changed files with 4 additions and 4 deletions
phpBB/styles/prosilver/template
overall_header.html
tests/functional
auth_test.phpnotification_test.php

2
phpBB/styles/prosilver/template/overall_header.html

@@ -89,7 +89,7 @@
<!-- EVENT overall_header_breadcrumb_append --> <!-- EVENT overall_header_breadcrumb_append -->
</li> </li>
<!-- IF S_REGISTERED_USER --><li class="rightside"><!-- IF CURRENT_USER_AVATAR --><span class="avatar-overall-header">{CURRENT_USER_AVATAR}</span> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF --> <!-- IF S_REGISTERED_USER --><li id="username_logged_in" class="rightside"><!-- IF CURRENT_USER_AVATAR --><span class="avatar-overall-header">{CURRENT_USER_AVATAR}</span> <!-- ENDIF -->{USERNAME_FULL}</li><!-- ENDIF -->
<!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_EMAIL_TOPIC --><li class="rightside"><a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}" class="sendemail">{L_EMAIL_TOPIC}</a></li><!-- ENDIF -->
<!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF --> <!-- IF U_EMAIL_PM --><li class="rightside"><a href="{U_EMAIL_PM}" title="{L_EMAIL_PM}" class="sendemail">{L_EMAIL_PM}</a></li><!-- ENDIF -->
<!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF --> <!-- IF U_PRINT_TOPIC --><li class="rightside"><a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p" class="print">{L_PRINT_TOPIC}</a></li><!-- ENDIF -->

4
tests/functional/auth_test.php

@@ -18,7 +18,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
// check for logout link // check for logout link
$crawler = self::request('GET', 'index.php'); $crawler = self::request('GET', 'index.php');
$this->assertContains($this->lang('LOGOUT_USER', 'admin'), $crawler->filter('.navbar')->text()); $this->assertContains($this->lang('LOGOUT', 'admin'), $crawler->filter('.navbar')->text());
} }
public function test_login_other() public function test_login_other()
@@ -26,7 +26,7 @@ class phpbb_functional_auth_test extends phpbb_functional_test_case
$this->create_user('anothertestuser'); $this->create_user('anothertestuser');
$this->login('anothertestuser'); $this->login('anothertestuser');
$crawler = self::request('GET', 'index.php'); $crawler = self::request('GET', 'index.php');
$this->assertContains('anothertestuser', $crawler->filter('.icon-logout')->text()); $this->assertContains('anothertestuser', $crawler->filter('#username_logged_in')->text());
} }
/** /**

2
tests/functional/notification_test.php

@@ -60,7 +60,7 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
$this->add_user_group('NEWLY_REGISTERED', array('notificationtestuser')); $this->add_user_group('NEWLY_REGISTERED', array('notificationtestuser'));
$this->login('notificationtestuser'); $this->login('notificationtestuser');
$crawler = self::request('GET', 'index.php'); $crawler = self::request('GET', 'index.php');
$this->assertContains('notificationtestuser', $crawler->filter('.icon-logout')->text()); $this->assertContains('notificationtestuser', $crawler->filter('#username_logged_in')->text());
// Post a new post that needs approval // Post a new post that needs approval
$this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD'); $this->create_post(2, 1, 'Re: Welcome to phpBB3', 'This is a test [b]post[/b] posted by notificationtestuser.', array(), 'POST_STORED_MOD');