summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2017-05-11 15:53:06 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2017-05-11 15:53:06 +0000
commit455d4e25bf231f34ea066d0c9747a80b86eb1699 (patch)
treefb0b129646be2d6e4fdd3ba23b43612ffcb700f9 /spec
parent466564d9a3e2661e257c424c8862fa00fe07e61f (diff)
parentd922f54548ee64ff8cffb7234f574333d4edd2b7 (diff)
downloadgitlab-ce-455d4e25bf231f34ea066d0c9747a80b86eb1699.tar.gz
Merge branch 'zj-clean-up-ci-variables-table' into 'master'
Clean up ci variables table Closes #31799 See merge request !11186
Diffstat (limited to 'spec')
-rw-r--r--spec/factories/ci/variables.rb2
-rw-r--r--spec/models/ci/variable_spec.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/factories/ci/variables.rb b/spec/factories/ci/variables.rb
index 6653f0bb5c3..c5fba597c1c 100644
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
@@ -2,5 +2,7 @@ FactoryGirl.define do
factory :ci_variable, class: Ci::Variable do
sequence(:key) { |n| "VARIABLE_#{n}" }
value 'VARIABLE_VALUE'
+
+ project factory: :empty_project
end
end
diff --git a/spec/models/ci/variable_spec.rb b/spec/models/ci/variable_spec.rb
index 048d25869bc..fe8c52d5353 100644
--- a/spec/models/ci/variable_spec.rb
+++ b/spec/models/ci/variable_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
describe Ci::Variable, models: true do
- subject { Ci::Variable.new }
+ subject { build(:ci_variable) }
let(:secret_value) { 'secret' }