From 3bdc57f0a710b3769381ecad7ea4098223ecff56 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Sat, 16 Apr 2016 21:09:08 +0200 Subject: Create table for award emoji --- spec/factories/notes.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index e5dcb159014..2bfc5effd78 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -36,8 +36,6 @@ FactoryGirl.define do factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff] factory :note_on_project_snippet, traits: [:on_project_snippet] factory :system_note, traits: [:system] - factory :downvote_note, traits: [:award, :downvote] - factory :upvote_note, traits: [:award, :upvote] trait :on_commit do project @@ -69,10 +67,6 @@ FactoryGirl.define do system true end - trait :award do - is_award true - end - trait :downvote do note "thumbsdown" end -- cgit v1.2.1 From f1479b56b71bef63517b90fcde99e6508e9c54af Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Mon, 9 May 2016 18:00:28 +0200 Subject: Remove the annotate gem and delete old annotations In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382 --- spec/factories/notes.rb | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index e5dcb159014..840b13196a6 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -1,24 +1,3 @@ -# == Schema Information -# -# Table name: notes -# -# id :integer not null, primary key -# note :text -# noteable_type :string(255) -# author_id :integer -# created_at :datetime -# updated_at :datetime -# project_id :integer -# attachment :string(255) -# line_code :string(255) -# commit_id :string(255) -# noteable_id :integer -# system :boolean default(FALSE), not null -# st_diff :text -# updated_by_id :integer -# is_award :boolean default(FALSE), not null -# - require_relative '../support/repo_helpers' include ActionDispatch::TestProcess -- cgit v1.2.1 From c452fa8124ffe18e2e74e14491dcb3e419e60057 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 13 May 2016 14:53:42 -0500 Subject: Update specs --- spec/factories/notes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 840b13196a6..26719f2652c 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -9,10 +9,10 @@ FactoryGirl.define do author factory :note_on_commit, traits: [:on_commit] - factory :note_on_commit_diff, traits: [:on_commit, :on_diff] + factory :note_on_commit_diff, traits: [:on_commit, :on_diff], class: LegacyDiffNote factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_merge_request, traits: [:on_merge_request] - factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff] + factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote factory :note_on_project_snippet, traits: [:on_project_snippet] factory :system_note, traits: [:system] factory :downvote_note, traits: [:award, :downvote] -- cgit v1.2.1 From bf0b51d252e049404a49787c18e5c88071006e15 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 26 Apr 2016 11:11:58 +0200 Subject: Update note factory to include noteable association --- spec/factories/notes.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 26719f2652c..7e9378ab625 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -4,13 +4,14 @@ include ActionDispatch::TestProcess FactoryGirl.define do factory :note do - project note "Note" author + noteable { create(:issue) } + project { noteable.project } + factory :note_on_issue, aliases: [:votable_note] factory :note_on_commit, traits: [:on_commit] factory :note_on_commit_diff, traits: [:on_commit, :on_diff], class: LegacyDiffNote - factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_merge_request, traits: [:on_merge_request] factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote factory :note_on_project_snippet, traits: [:on_project_snippet] @@ -20,6 +21,7 @@ FactoryGirl.define do trait :on_commit do project + noteable nil commit_id RepoHelpers.sample_commit.id noteable_type "Commit" end @@ -29,19 +31,11 @@ FactoryGirl.define do end trait :on_merge_request do - project - noteable_id 1 - noteable_type "MergeRequest" - end - - trait :on_issue do - noteable_id 1 - noteable_type "Issue" + noteable { create(:merge_request) } end trait :on_project_snippet do - noteable_id 1 - noteable_type "Snippet" + noteable { create(:snippet) } end trait :system do -- cgit v1.2.1 From 21d0cddd456c03e776a8b30e4695ede94c400792 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 26 Apr 2016 13:50:48 +0200 Subject: Do not override foreign attributes in note factory --- spec/factories/notes.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 7e9378ab625..cabab0c2207 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -4,10 +4,10 @@ include ActionDispatch::TestProcess FactoryGirl.define do factory :note do + project note "Note" author - noteable { create(:issue) } - project { noteable.project } + noteable { create(:issue, project: project) } factory :note_on_issue, aliases: [:votable_note] factory :note_on_commit, traits: [:on_commit] @@ -20,7 +20,6 @@ FactoryGirl.define do factory :upvote_note, traits: [:award, :upvote] trait :on_commit do - project noteable nil commit_id RepoHelpers.sample_commit.id noteable_type "Commit" @@ -31,11 +30,11 @@ FactoryGirl.define do end trait :on_merge_request do - noteable { create(:merge_request) } + noteable { create(:merge_request, project: project) } end trait :on_project_snippet do - noteable { create(:snippet) } + noteable { create(:snippet, project: project) } end trait :system do -- cgit v1.2.1 From e558edd1ce47c3c056dd95c0eba8fd811ee749c7 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 26 Apr 2016 13:52:18 +0200 Subject: Update specs to carry out changes in note factory --- spec/factories/notes.rb | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index cabab0c2207..2940ac342a2 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -9,7 +9,7 @@ FactoryGirl.define do author noteable { create(:issue, project: project) } - factory :note_on_issue, aliases: [:votable_note] + factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_commit, traits: [:on_commit] factory :note_on_commit_diff, traits: [:on_commit, :on_diff], class: LegacyDiffNote factory :note_on_merge_request, traits: [:on_merge_request] @@ -19,24 +19,33 @@ FactoryGirl.define do factory :downvote_note, traits: [:award, :downvote] factory :upvote_note, traits: [:award, :upvote] + trait :on_issue do + noteable_type 'Issue' + end + trait :on_commit do noteable nil commit_id RepoHelpers.sample_commit.id noteable_type "Commit" end - trait :on_diff do - line_code "0_184_184" - end - trait :on_merge_request do - noteable { create(:merge_request, project: project) } + noteable_type 'MergeRequest' + noteable do + create(:merge_request, source_project: project, + target_project: project) + end end trait :on_project_snippet do + noteable_type 'Snippet' noteable { create(:snippet, project: project) } end + trait :on_diff do + line_code "0_184_184" + end + trait :system do system true end -- cgit v1.2.1 From fc57d36018a23c15da013bebf42d51f7a8e9a955 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 4 May 2016 11:17:16 +0200 Subject: Minor changes in note validation specs --- spec/factories/notes.rb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 2940ac342a2..6801438165d 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -9,9 +9,9 @@ FactoryGirl.define do author noteable { create(:issue, project: project) } - factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_commit, traits: [:on_commit] factory :note_on_commit_diff, traits: [:on_commit, :on_diff], class: LegacyDiffNote + factory :note_on_issue, traits: [:on_issue], aliases: [:votable_note] factory :note_on_merge_request, traits: [:on_merge_request] factory :note_on_merge_request_diff, traits: [:on_merge_request, :on_diff], class: LegacyDiffNote factory :note_on_project_snippet, traits: [:on_project_snippet] @@ -19,14 +19,20 @@ FactoryGirl.define do factory :downvote_note, traits: [:award, :downvote] factory :upvote_note, traits: [:award, :upvote] - trait :on_issue do - noteable_type 'Issue' - end - trait :on_commit do noteable nil + noteable_type 'Commit' + noteable_id nil commit_id RepoHelpers.sample_commit.id - noteable_type "Commit" + end + + trait :on_diff do + line_code "0_184_184" + end + + trait :on_issue do + noteable_type 'Issue' + noteable { create(:issue, project: project) } end trait :on_merge_request do @@ -42,10 +48,6 @@ FactoryGirl.define do noteable { create(:snippet, project: project) } end - trait :on_diff do - line_code "0_184_184" - end - trait :system do system true end -- cgit v1.2.1 From cc2efcf1a681223d5c74eef6fca73cde71dce7c2 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 18 May 2016 18:21:14 +0200 Subject: Improve notes factory --- spec/factories/notes.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 6801438165d..6f9b3568e70 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -37,10 +37,7 @@ FactoryGirl.define do trait :on_merge_request do noteable_type 'MergeRequest' - noteable do - create(:merge_request, source_project: project, - target_project: project) - end + noteable { create(:merge_request, source_project: project) } end trait :on_project_snippet do -- cgit v1.2.1 From dbba60029c84fa091350d3a7d8b2e73cfec25f7e Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 18 May 2016 19:38:52 +0200 Subject: Improve note factory --- spec/factories/notes.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'spec/factories/notes.rb') diff --git a/spec/factories/notes.rb b/spec/factories/notes.rb index 6f9b3568e70..c32e205ee69 100644 --- a/spec/factories/notes.rb +++ b/spec/factories/notes.rb @@ -7,7 +7,7 @@ FactoryGirl.define do project note "Note" author - noteable { create(:issue, project: project) } + on_issue factory :note_on_commit, traits: [:on_commit] factory :note_on_commit_diff, traits: [:on_commit, :on_diff], class: LegacyDiffNote @@ -21,8 +21,8 @@ FactoryGirl.define do trait :on_commit do noteable nil - noteable_type 'Commit' noteable_id nil + noteable_type 'Commit' commit_id RepoHelpers.sample_commit.id end @@ -31,17 +31,14 @@ FactoryGirl.define do end trait :on_issue do - noteable_type 'Issue' noteable { create(:issue, project: project) } end trait :on_merge_request do - noteable_type 'MergeRequest' noteable { create(:merge_request, source_project: project) } end trait :on_project_snippet do - noteable_type 'Snippet' noteable { create(:snippet, project: project) } end -- cgit v1.2.1