summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-25 09:56:39 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-25 09:56:39 +0200
commit34f994b7c50fa45c4257cbe5f0fef61f58abb549 (patch)
tree0aa89fd111015483d39ced5496587104b913ced1
parent1e64333c5fe81a36373f0d437e425e8cab107a91 (diff)
downloadgitlab-ce-34f994b7c50fa45c4257cbe5f0fef61f58abb549.tar.gz
Improve dev fixtures
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/models/project_team.rb4
-rw-r--r--db/fixtures/development/05_users.rb2
-rw-r--r--db/fixtures/development/09_issues.rb2
-rw-r--r--db/fixtures/development/10_merge_requests.rb2
4 files changed, 7 insertions, 3 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index 83416a08164..5630f280aea 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -64,6 +64,10 @@ class ProjectTeam
UsersProject.truncate_team(project)
end
+ def users
+ members
+ end
+
def members
@members ||= fetch_members
end
diff --git a/db/fixtures/development/05_users.rb b/db/fixtures/development/05_users.rb
index cbb3e636acc..3440a645408 100644
--- a/db/fixtures/development/05_users.rb
+++ b/db/fixtures/development/05_users.rb
@@ -1,5 +1,5 @@
Gitlab::Seeder.quiet do
- (2..50).each do |i|
+ (2..10).each do |i|
begin
User.seed(:id, [{
id: i,
diff --git a/db/fixtures/development/09_issues.rb b/db/fixtures/development/09_issues.rb
index 85e309b6335..2b81d7a2597 100644
--- a/db/fixtures/development/09_issues.rb
+++ b/db/fixtures/development/09_issues.rb
@@ -6,7 +6,7 @@ Gitlab::Seeder.quiet do
project = Project.all.sample
# Random user
- user = project.users.sample
+ user = project.team.users.sample
next unless user
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index 75f6e56985d..2b1f4160211 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -6,7 +6,7 @@ Gitlab::Seeder.quiet do
project = Project.all.sample
# Random user
- user = project.users.sample
+ user = project.team.users.sample
next unless user