From e5cf527f279964a8952de544526e8def226b98d7 Mon Sep 17 00:00:00 2001 From: Timothy Andrew Date: Mon, 18 Apr 2016 15:48:54 +0530 Subject: Allow expiration of personal access tokens. --- spec/factories/personal_access_tokens.rb | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 spec/factories/personal_access_tokens.rb (limited to 'spec/factories') diff --git a/spec/factories/personal_access_tokens.rb b/spec/factories/personal_access_tokens.rb new file mode 100644 index 00000000000..da4c72bcb5b --- /dev/null +++ b/spec/factories/personal_access_tokens.rb @@ -0,0 +1,9 @@ +FactoryGirl.define do + factory :personal_access_token do + user + token { SecureRandom.hex(50) } + name { FFaker::Product.brand } + revoked false + expires_at { 5.days.from_now } + end +end -- cgit v1.2.1 From 0568b90c97dcbad3ab100e060fef91e0786aafe8 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Fri, 10 Jun 2016 16:53:20 -0300 Subject: Remove deprecated issues_tracker and issues_tracker_id from project --- spec/factories/projects.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/factories') diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index da8d97c9f82..5c8ddbebf0d 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -67,9 +67,6 @@ FactoryGirl.define do 'new_issue_url' => 'http://redmine/projects/project_name_in_redmine/issues/new' } ) - - project.issues_tracker = 'redmine' - project.issues_tracker_id = 'project_name_in_redmine' end end @@ -84,9 +81,6 @@ FactoryGirl.define do 'new_issue_url' => 'http://jira.example/secure/CreateIssue.jspa' } ) - - project.issues_tracker = 'jira' - project.issues_tracker_id = 'project_name_in_jira' end end end -- cgit v1.2.1 From 3ade826065f38e3734090cf34fbfc28b68ba79d0 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Tue, 14 Jun 2016 13:51:12 +0200 Subject: Add specs for models and services --- spec/factories/deployments.rb | 12 ++++++++++++ spec/factories/environments.rb | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 spec/factories/deployments.rb create mode 100644 spec/factories/environments.rb (limited to 'spec/factories') diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb new file mode 100644 index 00000000000..f335a111a7d --- /dev/null +++ b/spec/factories/deployments.rb @@ -0,0 +1,12 @@ +FactoryGirl.define do + factory :deployment, class: Deployment do + sha '97de212e80737a608d939f648d959671fb0a0142' + ref 'master' + + environment factory: :environment + + after(:build) do |deployment, evaluator| + deployment.project = deployment.environment.project + end + end +end diff --git a/spec/factories/environments.rb b/spec/factories/environments.rb new file mode 100644 index 00000000000..07265c26ca3 --- /dev/null +++ b/spec/factories/environments.rb @@ -0,0 +1,7 @@ +FactoryGirl.define do + factory :environment, class: Environment do + sequence(:name) { |n| "environment#{n}" } + + project factory: :empty_project + end +end -- cgit v1.2.1 From cd3f112f88c2362bb64961e52e6272314287a80b Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 15 Jun 2016 17:34:44 +0800 Subject: Adopt the rename from ci_commits to ci_pipelines --- spec/factories/ci/commits.rb | 49 ------------------------------------------ spec/factories/ci/pipelines.rb | 49 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 spec/factories/ci/commits.rb create mode 100644 spec/factories/ci/pipelines.rb (limited to 'spec/factories') diff --git a/spec/factories/ci/commits.rb b/spec/factories/ci/commits.rb deleted file mode 100644 index a039bef6f3c..00000000000 --- a/spec/factories/ci/commits.rb +++ /dev/null @@ -1,49 +0,0 @@ -# == Schema Information -# -# Table name: commits -# -# id :integer not null, primary key -# project_id :integer -# ref :string(255) -# sha :string(255) -# before_sha :string(255) -# push_data :text -# created_at :datetime -# updated_at :datetime -# tag :boolean default(FALSE) -# yaml_errors :text -# committed_at :datetime -# gl_project_id :integer -# - -FactoryGirl.define do - factory :ci_empty_pipeline, class: Ci::Pipeline do - sha '97de212e80737a608d939f648d959671fb0a0142' - - project factory: :empty_project - - factory :ci_pipeline_without_jobs do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { YAML.dump({}) } - end - end - - factory :ci_pipeline_with_one_job do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" } }) } - end - end - - factory :ci_pipeline_with_two_job do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" }, spinach: { script: "ls" } }) } - end - end - - factory :ci_pipeline do - after(:build) do |commit| - allow(commit).to receive(:ci_yaml_file) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) } - end - end - end -end diff --git a/spec/factories/ci/pipelines.rb b/spec/factories/ci/pipelines.rb new file mode 100644 index 00000000000..a039bef6f3c --- /dev/null +++ b/spec/factories/ci/pipelines.rb @@ -0,0 +1,49 @@ +# == Schema Information +# +# Table name: commits +# +# id :integer not null, primary key +# project_id :integer +# ref :string(255) +# sha :string(255) +# before_sha :string(255) +# push_data :text +# created_at :datetime +# updated_at :datetime +# tag :boolean default(FALSE) +# yaml_errors :text +# committed_at :datetime +# gl_project_id :integer +# + +FactoryGirl.define do + factory :ci_empty_pipeline, class: Ci::Pipeline do + sha '97de212e80737a608d939f648d959671fb0a0142' + + project factory: :empty_project + + factory :ci_pipeline_without_jobs do + after(:build) do |commit| + allow(commit).to receive(:ci_yaml_file) { YAML.dump({}) } + end + end + + factory :ci_pipeline_with_one_job do + after(:build) do |commit| + allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" } }) } + end + end + + factory :ci_pipeline_with_two_job do + after(:build) do |commit| + allow(commit).to receive(:ci_yaml_file) { YAML.dump({ rspec: { script: "ls" }, spinach: { script: "ls" } }) } + end + end + + factory :ci_pipeline do + after(:build) do |commit| + allow(commit).to receive(:ci_yaml_file) { File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) } + end + end + end +end -- cgit v1.2.1 From 2541e50d7ce64bb402d06dc9d75567b78282c7b7 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Wed, 15 Jun 2016 12:03:49 +0200 Subject: Improve validations --- spec/factories/deployments.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'spec/factories') diff --git a/spec/factories/deployments.rb b/spec/factories/deployments.rb index f335a111a7d..82591604fcb 100644 --- a/spec/factories/deployments.rb +++ b/spec/factories/deployments.rb @@ -2,6 +2,7 @@ FactoryGirl.define do factory :deployment, class: Deployment do sha '97de212e80737a608d939f648d959671fb0a0142' ref 'master' + tag false environment factory: :environment -- cgit v1.2.1