OSDN Git Service

Use project_with_code factory where necessary
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 1 Apr 2013 15:16:08 +0000 (18:16 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Mon, 1 Apr 2013 15:16:08 +0000 (18:16 +0300)
app/views/admin/projects/show.html.haml
features/steps/project/project_browse_commits.rb
spec/controllers/commit_controller_spec.rb
spec/controllers/commits_controller_spec.rb
spec/controllers/merge_requests_controller_spec.rb
spec/controllers/tree_controller_spec.rb
spec/features/gitlab_flavored_markdown_spec.rb
spec/helpers/gitlab_markdown_helper_spec.rb

index 27c687b..92b8960 100644 (file)
           %span.light ssh:
           %strong
             = link_to @project.ssh_url_to_repo
-        %li
-          %span.light fs:
-          %strong
-            = @repository.path_to_repo
+        - if @project.repository.exists?
+          %li
+            %span.light fs:
+            %strong
+              = @repository.path_to_repo
 
-        %li
-          %span.light last commit:
-          %strong
-            - if @repository
+          %li
+            %span.light last commit:
+            %strong
               = last_commit(@project)
-            - else
-              never
+        - else
+          %li
+            %span.light repository:
+            %strong.cred
+              does not exist
 
         %li
           %span.light access:
index 3433c2b..b4c595f 100644 (file)
@@ -15,7 +15,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
   end
 
   Then 'I see commits atom feed' do
-    commit = CommitDecorator.decorate(@project.repository.commit)
+    commit = @project.repository.commit
     page.response_headers['Content-Type'].should have_content("application/atom+xml")
     page.body.should have_selector("title", :text => "Recent commits to #{@project.name}")
     page.body.should have_selector("author email", :text => commit.author_email)
index 7bf1382..5fffbf0 100644 (file)
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CommitController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   let(:commit)  { project.repository.last_commit_for("master") }
 
index 99cbcd1..ce40291 100644 (file)
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CommitsController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
 
   before do
index 37e36ef..e8dd9bf 100644 (file)
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe MergeRequestsController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
   let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") }
 
index 81c7656..8232f14 100644 (file)
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe TreeController do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:user)    { create(:user) }
 
   before do
index a57e34a..653ff86 100644 (file)
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "Gitlab Flavored Markdown" do
-  let(:project) { create(:project) }
+  let(:project) { create(:project_with_code) }
   let(:issue) { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, project: project) }
   let(:fred) do
index 234608c..e67e211 100644 (file)
@@ -7,7 +7,7 @@ describe GitlabMarkdownHelper do
   let!(:project) { create(:project) }
 
   let(:user)          { create(:user, username: 'gfm') }
-  let(:commit)        { project.repository.commit) }
+  let(:commit)        { project.repository.commit }
   let(:issue)         { create(:issue, project: project) }
   let(:merge_request) { create(:merge_request, project: project) }
   let(:snippet)       { create(:snippet, project: project) }