Merge pull request lokka#183 from morygonzalez/fix-admin-login-layout…

…-rendering-bug Fix admin login layout rendering bug / ログイン失敗時レンダリングのバグを修正しました
sanemat · Nov 19, 2012 · 6a55220 · 6a55220
2 parents fd2cc99 + 0a7db6a
commit 6a55220
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/lib/lokka/app/admin.rb b/lib/lokka/app/admin.rb
@@ -22,7 +22,7 @@ class App
         end
       else
         @login_failed = true
-        haml :'admin/login', :layout => :'admin/layout'
+        haml :'admin/login', :layout => false
       end
     end
 

diff --git a/spec/integration/login_spec.rb b/spec/integration/login_spec.rb
@@ -4,6 +4,21 @@
   include_context 'in site'
   before { Factory(:user, :name => 'test') }
   after { User.destroy }
+
+  shared_examples_for 'login failed' do
+    it 'should not redirect' do
+      last_response.should_not be_redirect
+    end
+
+    it 'should render login screen again' do
+      last_response.body.should match('<body class="admin_login">')
+    end
+
+    it 'should not render dashboard side bar' do
+      last_response.body.should_not match('<div id="aside">')
+    end
+  end
+
   context 'when valid username and password' do
     it 'should redirect to /admin/' do
       post '/admin/login', {:name => 'test', :password => 'test'}
@@ -14,23 +29,17 @@
   end
 
   context 'when invalid username' do
-    it 'should not redirect' do
-      post '/admin/login', {:name => 'wrong', :password => 'test'}
-      last_response.should_not be_redirect
-    end
+    before { post '/admin/login', {:name => 'wrong', :password => 'test'} }
+    it_behaves_like 'login failed'
   end
 
   context 'when invalid password' do
-    it 'should not redirect' do
-      post '/admin/login', {:name => 'test', :password => 'wrong'}
-      last_response.should_not be_redirect
-    end
+    before { post '/admin/login', {:name => 'test', :password => 'wrong'} }
+    it_behaves_like 'login failed'
   end
 
   context 'when invalid username and password' do
-    it 'should not redirect' do
-      post '/admin/login', {:name => 'wrong', :password => 'wrong'}
-      last_response.should_not be_redirect
-    end
+    before { post '/admin/login', {:name => 'wrong', :password => 'wrong'} }
+    it_behaves_like 'login failed'
   end
 end