Merge 616c78d into 63e9aa7

app/controllers/login_controller.rb

@@ -37,6 +37,10 @@ def logout
   end
 
   def failure
-    redirect_to :back, :alert => params[:message]
+    if request.env["HTTP_REFERER"]
+      redirect_to :back, :alert => params[:message]
+    else
+      redirect_to root_path, :alert => params[:message]
+    end
   end
 end

spec/controllers/login_controller_spec.rb

@@ -42,4 +42,20 @@
     its(:screen_name) { should == 'nickname' }
     its(:profile_image_url) { should == 'http://example.com/a.jpg' }
   end
+
+  context "login/failure" do
+    context "access from other page" do
+      before do
+        request.env["HTTP_REFERER"] = "http://example.com"
+        get :failure
+      end
+      it { should redirect_to "http://example.com" }
+    end
+    context "access directly" do
+      before do
+        get :failure
+      end
+      it { should redirect_to root_path }
+    end
+  end
 end