summaryrefslogtreecommitdiff
path: root/spec/helpers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-17 21:31:41 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-17 21:31:41 +0300
commit8bff9a4098c80e0b44bf7f07a2b471c6ad54d213 (patch)
tree835c85d8c95a99249b84bcc7e86550da13c66aaf /spec/helpers
parent6dff16a6799cc34cd2cf70cebce70bbffc70c3f5 (diff)
parent07bc48c526bc48e0ee5590f4232484d9ee8f8c35 (diff)
downloadgitlab-ce-8bff9a4098c80e0b44bf7f07a2b471c6ad54d213.tar.gz
Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre
Diffstat (limited to 'spec/helpers')
-rw-r--r--spec/helpers/gitlab_markdown_helper_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index ba6af6f8b45..46337f8bafd 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -12,7 +12,7 @@ describe GitlabMarkdownHelper do
let(:issue) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:snippet) { create(:project_snippet, project: project) }
- let(:member) { project.users_projects.where(user_id: user).first }
+ let(:member) { project.project_members.where(user_id: user).first }
before do
# Helper expects a @project instance variable