diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-01-24 14:02:11 +0100 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-01-24 14:02:11 +0100 |
| commit | 54bcb6cc2a863e10abdd76745d3a0d50c301ab77 (patch) | |
| tree | b374b46630cb1663ff8b6657a895b8087242fcfe /spec/helpers | |
| parent | d819d0d1f84946bcc0d2c871682c220db6dbd478 (diff) | |
| parent | d1d138562a347ec78f0331d5242e28fbb368bad0 (diff) | |
| download | gitlab-ce-54bcb6cc2a863e10abdd76745d3a0d50c301ab77.tar.gz | |
Merge branch 'master' into reference_relative_links
Conflicts:
spec/models/project_spec.rb
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/gitlab_markdown_helper_spec.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/search_helper_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb index a3efdffeebc..c3429d5894d 100644 --- a/spec/helpers/gitlab_markdown_helper_spec.rb +++ b/spec/helpers/gitlab_markdown_helper_spec.rb @@ -4,7 +4,7 @@ describe GitlabMarkdownHelper do include ApplicationHelper include IssuesHelper - let!(:project) { create(:project_with_code) } + let!(:project) { create(:project) } let(:user) { create(:user, username: 'gfm') } let(:commit) { project.repository.commit } diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb index d04945dfe35..733f2754727 100644 --- a/spec/helpers/search_helper_spec.rb +++ b/spec/helpers/search_helper_spec.rb @@ -43,7 +43,7 @@ describe SearchHelper do end context "with a current project" do - before { @project = create(:project_with_code) } + before { @project = create(:project) } it "includes project-specific sections" do search_autocomplete_opts("Files").size.should == 1 |