diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 15:23:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-05 15:23:57 +0200 |
commit | 00fcdebed758f031b486ec239fd425fc54a180b3 (patch) | |
tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /spec/fabricators | |
parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
parent | 028ad4124cf1fdb28f5cf11bd7080e7a63f2f99e (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
Diffstat (limited to 'spec/fabricators')
-rw-r--r-- | spec/fabricators/account_fabricator.rb | 2 | ||||
-rw-r--r-- | spec/fabricators/list_fabricator.rb | 2 | ||||
-rw-r--r-- | spec/fabricators/relay_fabricator.rb | 2 | ||||
-rw-r--r-- | spec/fabricators/site_upload_fabricator.rb | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/spec/fabricators/account_fabricator.rb b/spec/fabricators/account_fabricator.rb index 7aa983f82..e092e6c09 100644 --- a/spec/fabricators/account_fabricator.rb +++ b/spec/fabricators/account_fabricator.rb @@ -6,5 +6,5 @@ Fabricator(:account) do username { sequence(:username) { |i| "#{Faker::Internet.user_name(nil, %w(_))}#{i}" } } last_webfingered_at { Time.now.utc } public_key { public_key } - private_key { private_key} + private_key { private_key } end diff --git a/spec/fabricators/list_fabricator.rb b/spec/fabricators/list_fabricator.rb index 2a61b317b..c3db690fa 100644 --- a/spec/fabricators/list_fabricator.rb +++ b/spec/fabricators/list_fabricator.rb @@ -1,4 +1,4 @@ Fabricator(:list) do account - title "MyString" + title "MyString" end diff --git a/spec/fabricators/relay_fabricator.rb b/spec/fabricators/relay_fabricator.rb index 3f8726f6b..488913f77 100644 --- a/spec/fabricators/relay_fabricator.rb +++ b/spec/fabricators/relay_fabricator.rb @@ -1,4 +1,4 @@ Fabricator(:relay) do inbox_url "https://example.com/inbox" - state :idle + state :idle end diff --git a/spec/fabricators/site_upload_fabricator.rb b/spec/fabricators/site_upload_fabricator.rb index 8f4e43ac9..4a171486f 100644 --- a/spec/fabricators/site_upload_fabricator.rb +++ b/spec/fabricators/site_upload_fabricator.rb @@ -1,3 +1,2 @@ Fabricator(:site_upload) do - end |