diff options
author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:25 +0000 |
---|---|---|
committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:25 +0000 |
commit | 0e5ee119b7f037b7ce9e84d20306d0acfcd320cd (patch) | |
tree | 3011f2c7584a9f037c05219b13fe5923ddda4c17 /spec/factories | |
parent | 88ba7a034be6c2a93c495edd1d1db08ec6d98bb3 (diff) | |
parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
download | gitlab-ce-0e5ee119b7f037b7ce9e84d20306d0acfcd320cd.tar.gz |
Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/services.rb | 1 | ||||
-rw-r--r-- | spec/factories/users.rb | 4 | ||||
-rw-r--r-- | spec/factories/web_hook_log.rb | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/spec/factories/services.rb b/spec/factories/services.rb index 28ddd0da753..3fad4d2d658 100644 --- a/spec/factories/services.rb +++ b/spec/factories/services.rb @@ -20,7 +20,6 @@ FactoryGirl.define do project factory: :empty_project active true properties({ - namespace: 'somepath', api_url: 'https://kubernetes.example.com', token: 'a' * 40 }) diff --git a/spec/factories/users.rb b/spec/factories/users.rb index 33fa80772ff..e60fe713bc3 100644 --- a/spec/factories/users.rb +++ b/spec/factories/users.rb @@ -8,6 +8,10 @@ FactoryGirl.define do confirmation_token { nil } can_create_group true + before(:create) do |user| + user.ensure_rss_token + end + trait :admin do admin true end diff --git a/spec/factories/web_hook_log.rb b/spec/factories/web_hook_log.rb new file mode 100644 index 00000000000..230b3f6b26e --- /dev/null +++ b/spec/factories/web_hook_log.rb @@ -0,0 +1,14 @@ +FactoryGirl.define do + factory :web_hook_log do + web_hook factory: :project_hook + trigger 'push_hooks' + url { generate(:url) } + request_headers {} + request_data {} + response_headers {} + response_body '' + response_status '200' + execution_duration 2.0 + internal_error_message nil + end +end |