Merge branch 'wdtk' into develop

Conflicts:
	config/general.yml-example
	spec/models/track_mailer_spec.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 0ba542630..b4cc0d6e3 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -111,7 +111,7 @@ describe UserController, "when signing in" do
         get :signin, :r => "/list"
         response.should render_template('sign')
         post_redirect = get_last_postredirect
-        post :signin, { :user_signin => { :email => 'silly@localhost', :password => 'jonespassword' },
+        post :signin, { :user_signin => { :email => 'unconfirmed@localhost', :password => 'jonespassword' },
             :token => post_redirect.token
         }
         response.should render_template('confirm')
@@ -123,7 +123,7 @@ describe UserController, "when signing in" do
         get :signin, :r => "/list"
         post_redirect = get_last_postredirect
 
-        post :signin, { :user_signin => { :email => 'silly@localhost', :password => 'jonespassword' },
+        post :signin, { :user_signin => { :email => 'unconfirmed@localhost', :password => 'jonespassword' },
             :token => post_redirect.token
         }
         response.should send_email
@@ -143,7 +143,7 @@ describe UserController, "when signing in" do
         # check confirmation URL works
         session[:user_id].should be_nil
         get :confirm, :email_token => post_redirect.email_token
-        session[:user_id].should == users(:silly_name_user).id
+        session[:user_id].should == users(:unconfirmed_user).id
         response.should redirect_to(:controller => 'request', :action => 'list', :post_redirect => 1)
     end