projects sorting by last_commit_date

3 files changed, 28 insertions, 5 deletions

diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 55e2cdd..a123f8f 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -27,10 +27,20 @@
 
 FactoryGirl.define do
   factory :project_without_token, class: Project do
-    name 'GitLab / gitlab-shell'
+    sequence :name do |n|
+      "GitLab / gitlab-shell#{n}"
+    end
+
     default_ref 'master'
-    gitlab_url 'http://demo.gitlabhq.com/gitlab/gitlab-shell'
-    ssh_url_to_repo 'git@demo.gitlab.com:gitlab/gitlab-shell.git'
+    
+    sequence :gitlab_url do |n|
+      "http://demo.gitlabhq.com/gitlab/gitlab-shell#{n}"
+    end
+    
+    sequence :ssh_url_to_repo do |n|
+      "git@demo.gitlab.com:gitlab/gitlab-shell#{n}.git"
+    end
+    
     gitlab_id 8
 
     factory :project do
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 7d92a19..034dfc1 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "Projects" do
   before do
     login_as :user
-    @project = FactoryGirl.create :project
+    @project = FactoryGirl.create :project, name: "GitLab / gitlab-shell"
   end
 
   describe "GET /projects", js: true do
@@ -12,7 +12,7 @@ describe "Projects" do
       visit projects_path
     end
 
-    it { page.should have_content @project.name }
+    it { page.should have_content "GitLab / gitlab-shell" }
   end
 
   describe "GET /projects/:id" do
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index af7d162..8ad2c69 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -46,6 +46,19 @@ describe Project do
     end
   end
 
+  describe "ordered_by_last_commit_date" do
+    it "returns ordered projects" do
+      newest_project = FactoryGirl.create :project
+      oldest_project = FactoryGirl.create :project
+      project_without_commits = FactoryGirl.create :project
+
+      FactoryGirl.create :commit, created_at: 1.hour.ago, project: newest_project
+      FactoryGirl.create :commit, created_at: 2.hour.ago, project: oldest_project
+
+      Project.ordered_by_last_commit_date.should == [newest_project, oldest_project, project_without_commits]
+    end
+  end
+
   context :valid_project do
     let(:project) { FactoryGirl.create :project }