comparison test/integration/admin_test.rb @ 514:7eba09d624db live

Merge

 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require "#{File.dirname(__FILE__)}/../test_helper"
+require File.expand_path('../../test_helper', __FILE__)
 
 class AdminTest < ActionController::IntegrationTest
   fixtures :all
 
   def test_add_user
     log_user("admin", "admin")
     get "/users/new"
     assert_response :success
     assert_template "users/new"
-    post "/users/create", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "[e-mail]", :language => "en" }, :password => "psmith09", :password_confirmation => "psmith09"
+    post "/users/create", :user => { :login => "psmith", :firstname => "Paul", :lastname => "Smith", :mail => "[e-mail]", :language => "en", :password => "psmith09", :password_confirmation => "psmith09" }
     
     user = User.find_by_login("psmith")
     assert_kind_of User, user
     assert_redirected_to "/users/#{ user.id }/edit"