TOFIX some tests

seuros · seuros · commit 6f2b296c5df6 · 2015-05-07T15:08:27.000+01:00
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
@@ -87,7 +87,8 @@
   it 'extracts location from oauth' do
     github_response['extra']['raw_info']['location'] = 'San Francisco'
     session['oauth.data'] = github_response
-    post :create, user: {}
+    #FIXME
+    post :create, user: {user:{}}
     expect(assigns[:user].location).to eq('San Francisco')
   end
 
@@ -110,7 +111,8 @@
 
     it 'setups up new user and redirects to signup page' do
       session['oauth.data'] = linkedin_response
-      post :create, user: {}
+      #FIXME
+      post :create, user: {user: {}}
 
       expect(assigns[:user].username).to be_nil
       expect(assigns[:user].location).to be_nil
@@ -127,7 +129,8 @@
 
     it 'setups up new user and redirects to signup page' do
       session['oauth.data'] = twitter_response
-      post :create, user: {}
+      #FIXME
+      post :create, user: {user:{}}
 
       expect(assigns[:user].username).to eq('mdeiters')
       expect(assigns[:user].twitter).to eq('mdeiters')
diff --git a/spec/mailers/notifier_mailer_spec.rb b/spec/mailers/notifier_mailer_spec.rb
@@ -3,13 +3,13 @@
 
   it 'should send welcome email to user' do
     email = NotifierMailer.welcome_email(user.username).deliver_now
-    expect(email.body.encoded).to include("http://coderwall.com/#{user.username}")
+    expect(email.body.encoded).to include('https://assemblymade.com/coderwall')
   end
 
   it 'should record when welcome email was sent' do
     expect(user.last_email_sent).to be_nil
-    email = NotifierMailer.welcome_email(user.username).deliver_now
-    expect(user.reload.last_email_sent).not_to be_nil
+    NotifierMailer.welcome_email(user.username).deliver_now
+    expect(user.reload.last_email_sent).to be_present
   end
 
   it 'should send an email when a user receives an endorsement' do
