diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-19 22:41:10 +0200 |
| commit | b481e4fac1c564b8008f6f1d0eea1727ec9faa08 (patch) | |
| tree | 6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /spec/fabricators | |
| parent | 625c4f36ef394215e65e19157bfaf60e7de94b5f (diff) | |
| parent | 6aa5ea1b5dff54941682cb006ac2b11ab7b77988 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: config/locales/simple_form.ja.yml
Diffstat (limited to 'spec/fabricators')
| -rw-r--r-- | spec/fabricators/web_push_subscription_fabricator.rb | 2 | ||||
| -rw-r--r-- | spec/fabricators/web_setting_fabricator.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/spec/fabricators/web_push_subscription_fabricator.rb b/spec/fabricators/web_push_subscription_fabricator.rb index 72d11b77c..97f90675d 100644 --- a/spec/fabricators/web_push_subscription_fabricator.rb +++ b/spec/fabricators/web_push_subscription_fabricator.rb @@ -1,4 +1,4 @@ -Fabricator(:web_push_subscription) do +Fabricator(:web_push_subscription, from: Web::PushSubscription) do endpoint Faker::Internet.url key_p256dh Faker::Internet.password key_auth Faker::Internet.password diff --git a/spec/fabricators/web_setting_fabricator.rb b/spec/fabricators/web_setting_fabricator.rb index e5136829b9..369b86bc1 100644 --- a/spec/fabricators/web_setting_fabricator.rb +++ b/spec/fabricators/web_setting_fabricator.rb @@ -1,3 +1,2 @@ -Fabricator('Web::Setting') do - +Fabricator(:web_setting, from: Web::Setting) do end |