Merge pull request #31 from adnanhemani/fix-push-comments

Fix push comments
ace-lab · Feb 19, 2019 · b1f1600 · b1f1600
2 parents 11ebb8d + 9026da4
commit b1f1600
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
@@ -40,11 +40,13 @@ class DashboardController < ApplicationController
 
   def index
     @projects = @client.projects
-    if session[:last_project] && @projects && !@projects.empty?
-      curr_proj = @client.project(session[:last_project])
-      @projects.unshift @projects.delete(curr_proj)
-    else
-      session[:last_project] = @projects.first.id
+    if @projects && !@projects.empty?
+      if session[:last_project]
+        curr_proj = @client.project(session[:last_project])
+        @projects.unshift @projects.delete(curr_proj)
+      else
+        session[:last_project] = @projects.first.id
+      end
     end
   end
 

diff --git a/spec/factories.rb b/spec/factories.rb
@@ -8,9 +8,9 @@
   end
 
   factory :vote do
-    user      Forgery::Internet.email_address
-    story_id  Forgery::Basic.number(at_least: 1, at_most: 20)
-    vote      Forgery::Basic.number(at_least: 1, at_most: 5)
+    user      { Forgery::Internet.email_address }
+    story_id  { Forgery::Basic.number(at_least: 1, at_most: 20) }
+    vote      { Forgery::Basic.number(at_least: 1, at_most: 5) }
   end
 
 end