Merge branch 'master' of github.com:fredwu/angel_nest

Author: gitfly

app/controllers/users_controller.rb

@@ -22,12 +22,13 @@ def show
 
   def message_inboxes
     @messages = case params[:type].try(:to_sym)
+      when :inbox_messages     then current_user.inbox_messages
       when :sent_messages      then current_user.sent_messages
       when :archived_messages  then current_user.archived_messages
       when :inbox_proposals    then current_user.inbox_proposals
       when :sent_proposals     then current_user.sent_proposals
       when :archived_proposals then current_user.archived_proposals
-      else                          current_user.inbox_messages
+      else redirect_to my_message_inbox_path(:inbox_messages)
     end
   end
 

app/views/devise/shared/_links.slim

@@ -1,15 +1,16 @@
-hr
-ul
-  - if controller_name != 'sessions'
-    li= link_to "Sign in", new_session_path(resource_name)
-  - if devise_mapping.registerable? && controller_name != 'registrations'
-    li= link_to "Sign up", new_registration_path(resource_name)
-  - if devise_mapping.recoverable? && controller_name != 'passwords'
-    li= link_to "Forgot your password?", new_password_path(resource_name)
-  - if devise_mapping.confirmable? && controller_name != 'confirmations'
-    li= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
-  - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
-    li= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
-  - if devise_mapping.omniauthable?
-    - resource_class.omniauth_providers.each do |provider|
-      li= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+- unless current_user
+  hr
+  ul
+    - if controller_name != 'sessions'
+      li= link_to "Sign in", new_session_path(resource_name)
+    - if devise_mapping.registerable? && controller_name != 'registrations'
+      li= link_to "Sign up", new_registration_path(resource_name)
+    - if devise_mapping.recoverable? && controller_name != 'passwords'
+      li= link_to "Forgot your password?", new_password_path(resource_name)
+    - if devise_mapping.confirmable? && controller_name != 'confirmations'
+      li= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+    - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+      li= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+    - if devise_mapping.omniauthable?
+      - resource_class.omniauth_providers.each do |provider|
+        li= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)

app/views/messages/show_private_message.html.slim

@@ -1,13 +1,15 @@
 .grid_3
   = render 'users/message_inboxes'
 .grid_9
+  - if @topic.is_with_proposal?
+    hr
+    h1= t('label.business_proposal')
+    .read_only= render 'proposals/form', :resource => @topic.proposal, :submit_path => '/'
+
+  h2= t('label.comments')
   ul#messages
     li.message= render 'show', :resource => @topic, :meta => {}
     - @topic.replies.each do |reply|
       li.message= render 'show', :resource => reply, :meta => {}
   br
   = render 'new', :url => my_private_message_path(@topic)
-  - if @topic.is_with_proposal?
-    hr
-    h1= t('label.business_proposal')
-    .read_only= render 'proposals/form', :resource => @topic.proposal, :submit_path => '/'

app/views/users/_index.html.slim

@@ -1,6 +1,6 @@
 ul.resource_list.user_list
   - collection.each do |user|
-    li.mini_profile data-target_link="#{startup_profile_team_path(meta[:parent])}" data-edit_target="#profile_team"
+    li.mini_profile data-target_link="#{startup_profile_team_path(meta[:parent]) if meta[:parent]}" data-edit_target="#profile_team"
       - unless meta[:role_identifier]
         hr
 

app/views/users/_mini_profile.html.slim

@@ -1,6 +1,3 @@
-- if user == current_user
-  = render 'shared/editable', :url => edit_registration_path(user)
-
 .mini_profile
   .profile_pic
     = render 'users/avatar', :user => user, :meta => {}

spec/requests/user_session_spec.rb

@@ -39,6 +39,12 @@ def sign_in_user(login = user.email)
     response.body.should include(user.name)
   end
 
+  it "rejects signing in with incorrect login" do
+    sign_in_user('dummy')
+
+    response.body.should include('Invalid email or password.')
+  end
+
   it "signs out" do
     sign_in_user
     get destroy_user_session_path
@@ -49,17 +55,13 @@ def sign_in_user(login = user.email)
   end
 
   it "sends user confirmation instructions" do
-    post user_confirmation_path, :user => {
-                                   :email => user_unconfirmed.email
-                                 }
+    post user_confirmation_path, :user => { :email => user_unconfirmed.email }
 
     response.should redirect_to(new_user_session_path)
   end
 
   it "sends reset password instructions" do
-    post user_password_path, :user => {
-                               :login => user.email
-                             }
+    post user_password_path, :user => { :login => user.email }
 
     response.should redirect_to(new_user_session_path)
   end