Merge branch 'MatzFan-master', fixes #2, thanks @MatzFan for

fixing this
padrinobook · Aug 24, 2015 · 178781d · 178781d
2 parents e8abcf9 + bc2d89e
commit 178781d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/spec/app/controllers/users_controller_spec.rb b/spec/app/controllers/users_controller_spec.rb
@@ -32,11 +32,10 @@
   describe "GET edit" do
     let(:user) { build(:user) }
 
-    xit "render the view for editing a user" do
-      User.should_receive(:find_by_id).at_least(:once).with(anything()).and_return(user)
-
-      get "/users/#{user.id}/edit"
-      # I come to this point but the last response is not okay but and routing error
+    it "render the view for editing a user" do
+      id = user.id
+      User.should_receive(:find_by_id).at_least(:once).and_return(user)
+      get "/users/#{id}/edit", {}, { 'rack.session' => { current_user: id } }
       last_response.should be_ok
     end