Commit f5dec306fda53a6b2e90f64c0407077ab0022e8f
1 parent
9a26e9a0
Exists in
master
and in
4 other branches
Use project_with_code factory where necessary
Showing
8 changed files
with
20 additions
and
17 deletions
Show diff stats
app/views/admin/projects/show.html.haml
... | ... | @@ -46,18 +46,21 @@ |
46 | 46 | %span.light ssh: |
47 | 47 | %strong |
48 | 48 | = link_to @project.ssh_url_to_repo |
49 | - %li | |
50 | - %span.light fs: | |
51 | - %strong | |
52 | - = @repository.path_to_repo | |
49 | + - if @project.repository.exists? | |
50 | + %li | |
51 | + %span.light fs: | |
52 | + %strong | |
53 | + = @repository.path_to_repo | |
53 | 54 | |
54 | - %li | |
55 | - %span.light last commit: | |
56 | - %strong | |
57 | - - if @repository | |
55 | + %li | |
56 | + %span.light last commit: | |
57 | + %strong | |
58 | 58 | = last_commit(@project) |
59 | - - else | |
60 | - never | |
59 | + - else | |
60 | + %li | |
61 | + %span.light repository: | |
62 | + %strong.cred | |
63 | + does not exist | |
61 | 64 | |
62 | 65 | %li |
63 | 66 | %span.light access: | ... | ... |
features/steps/project/project_browse_commits.rb
... | ... | @@ -15,7 +15,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps |
15 | 15 | end |
16 | 16 | |
17 | 17 | Then 'I see commits atom feed' do |
18 | - commit = CommitDecorator.decorate(@project.repository.commit) | |
18 | + commit = @project.repository.commit | |
19 | 19 | page.response_headers['Content-Type'].should have_content("application/atom+xml") |
20 | 20 | page.body.should have_selector("title", :text => "Recent commits to #{@project.name}") |
21 | 21 | page.body.should have_selector("author email", :text => commit.author_email) | ... | ... |
spec/controllers/commit_controller_spec.rb
spec/controllers/commits_controller_spec.rb
spec/controllers/merge_requests_controller_spec.rb
1 | 1 | require 'spec_helper' |
2 | 2 | |
3 | 3 | describe MergeRequestsController do |
4 | - let(:project) { create(:project) } | |
4 | + let(:project) { create(:project_with_code) } | |
5 | 5 | let(:user) { create(:user) } |
6 | 6 | let(:merge_request) { create(:merge_request_with_diffs, project: project, target_branch: "bcf03b5d~3", source_branch: "bcf03b5d") } |
7 | 7 | ... | ... |
spec/controllers/tree_controller_spec.rb
spec/features/gitlab_flavored_markdown_spec.rb
1 | 1 | require 'spec_helper' |
2 | 2 | |
3 | 3 | describe "Gitlab Flavored Markdown" do |
4 | - let(:project) { create(:project) } | |
4 | + let(:project) { create(:project_with_code) } | |
5 | 5 | let(:issue) { create(:issue, project: project) } |
6 | 6 | let(:merge_request) { create(:merge_request, project: project) } |
7 | 7 | let(:fred) do | ... | ... |
spec/helpers/gitlab_markdown_helper_spec.rb
... | ... | @@ -7,7 +7,7 @@ describe GitlabMarkdownHelper do |
7 | 7 | let!(:project) { create(:project) } |
8 | 8 | |
9 | 9 | let(:user) { create(:user, username: 'gfm') } |
10 | - let(:commit) { project.repository.commit) } | |
10 | + let(:commit) { project.repository.commit } | |
11 | 11 | let(:issue) { create(:issue, project: project) } |
12 | 12 | let(:merge_request) { create(:merge_request, project: project) } |
13 | 13 | let(:snippet) { create(:snippet, project: project) } | ... | ... |