Merge lp:~nurlan0000/psiphon/sprint3-610191 into lp:psiphon

[Nurlan Turdaliev]

[Adam P (adam+)]

httpd.conf suggests that a new file p.php has been created, but I don't see it in the diff or in the branch code. Perhaps it wasn't bzr-added?

review: Needs Fixing

[Adam Kruger (adam-kruger)]

-$config[db_pass] = "#psiphon_mysql_password#";
+$config[db_pass] = "root";

Please change this back to "#psiphon_mysql_password#". You may want to set your mysql password to this value for development purposes.

review: Needs Fixing

[Nurlan Turdaliev (nurlan0000)]

2010/8/26 Adam Kruger <email address hidden>

> Review: Needs Fixing
> -$config[db_pass] = "#psiphon_mysql_password#";
> +$config[db_pass] = "root";
>
> Please change this back to "#psiphon_mysql_password#". You may want to set
> your mysql password to this value for development purposes.
> --
> https://code.launchpad.net/~nurlan0000/psiphon/sprint3-610191/+merge/33761
> You are the owner of lp:~nurlan0000/psiphon/sprint3-610191.
>
Oh, sorry, Adam, I've been working on another ticket, it seems that changes
were added to this branch :(
I'm new to bazaar version control system, it seems I've commited some code
the wrong way :S
Will fix it as soon as possible, but we have a last Friday party tomorrow,
so I will start my work on Monday :)
Thanks for reviewing, regards :)

[lp:~nurlan0000/psiphon/sprint3-610191]

123. By Nurlan <ubuntu@ubuntu-desktop> on 2010-08-30

Removed unnecessary changes.

124. By Nurlan <ubuntu@ubuntu-desktop> on 2010-08-30

Removed unwanted changes from config.php and install script

[Nurlan Turdaliev (nurlan0000)]

Fixed :) Please review for merging :)

[Adam P (adam+)]

The functionality itself looks good, but there are still a couple of problems:

- You have make_password_reset_url in url_helpers.php, which I believe is part of the other ticket you're working on. It shouldn't be there. (You should probably create separate branches for each bug.)

- Your Selenium test case should be integrated into the overall selenium_test_suite.html, rather than in its own test suite. (Also, it's not actually in the test suite you created. You have '<a href="test_init.html">user_groups</a>', which just does the test_init again.)

review: Needs Fixing

[lp:~nurlan0000/psiphon/sprint3-610191]

125. By Nurlan <ubuntu@ubuntu-desktop> on 2010-08-31

Selenium tests fixed. Unnecessary function from url_helpers removed.

[Adam P (adam+)]

Sorry for the delay -- I didn't notice the email where you had checked in more changes.

There are some problems with the your user_groups.html test case. The login stuff uses hardcoded proxy info, which won't work on all machines, and hardcoded user stuff, which you haven't added to test_init.php and so doesn't work at all (except on your machine).

--- Login/Logout/Include ---

To log in, you should include login.html -- see bookmarks.html and login_delay.html for examples. You can specify what username and password should be used like this:
<tr>
  <td>include</td>
  <td>/selenium_scripts/login.html</td>
  <td>current_username=username,current_password=password</td>
</tr>
For more info, see: wiki.openqa.org/display/SEL/include

To logout, you should use this:
<tr>
  <td>include</td>
  <td>/selenium_scripts/logout.html</td>
  <td></td>
</tr>

--- Test users ---

If you need particular users to exist during your test, you should either create them using Selenium (using invitations or the Admin Users screen) or insert them directly into the database in test_init.php (you can see user 'seleniumadmin' being inserted there now).

---

Since I wasn't able to run the test at all, I don't know if there are other issues.

review: Needs Fixing

[Samat Jukeshov (jukeshov)]

we commit autotest for this ticket on full package of tests with #27 at https://spreadsheets.google.com/pub?key=0AmM0LQffI9KjdERDTFhycnE5RE4taEJTaVdZbXpWcUE&hl=en&output=html

review: Needs Resubmitting

[Adam Kruger (adam-kruger)]

Review comments:

- Since automated testing is being done elsewhere, please do not submit the selenium tests in the branch merge request.

review: Needs Fixing (group review)

[lp:~nurlan0000/psiphon/sprint3-610191]

126. By Nurlan Turdaliev <ubuntu@ubuntu-desktop> on 2010-10-21

selenium tests removed

[Nurlan Turdaliev (nurlan0000)]

review: Needs Resubmitting

[Adam Kruger (adam-kruger)]

review: Approve

=== modified file 'trunk/www/header.php'
--- trunk/www/header.php	2010-07-15 22:00:29 +0000
+++ trunk/www/header.php	2010-10-21 11:12:46 +0000
@@ -115,10 +115,13 @@
     echo "<hr>\n";
     $hr = 0;
 }
+
 if (user_has_permission($config, $record_user, "logout")) {
     echo "<a href=\"/logout.php?lu={$login_url}\">".msg("logout")."</a>\n<br>\n";
 }
 
+echo '<span id="user_group">', get_user_class_name($record_user['grp']), ': ', '<b>', $record_user['uname'], '</b></span><br />';
+
 ?>
 
 </td>