diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-20 22:41:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-20 22:41:20 +0100 |
| commit | 45087c1092143e95dfcc85b6c9abc5c6c0a0a5c2 (patch) | |
| tree | e4be53cb0b2e7f876bea6c61d4fe64d7586ae63d /spec/support | |
| parent | 4c68189d2b8b6a9a74fc13862b11bf6c6d523409 (diff) | |
| parent | dc0cc5a57d224b4c53bc58dad919b727055bd9a3 (diff) | |
Merge pull request #2117 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/matchers/model/model_have_error_on_field.rb | 4 | ||||
| -rw-r--r-- | spec/support/stories/profile_stories.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/spec/support/matchers/model/model_have_error_on_field.rb b/spec/support/matchers/model/model_have_error_on_field.rb index 85bdd8215..d85db2fca 100644 --- a/spec/support/matchers/model/model_have_error_on_field.rb +++ b/spec/support/matchers/model/model_have_error_on_field.rb @@ -1,8 +1,6 @@ RSpec::Matchers.define :model_have_error_on_field do |expected| match do |record| - if record.errors.empty? - record.valid? - end + record.valid? if record.errors.empty? record.errors.has_key?(expected) end diff --git a/spec/support/stories/profile_stories.rb b/spec/support/stories/profile_stories.rb index 0c4a14d1c..de7ae17e6 100644 --- a/spec/support/stories/profile_stories.rb +++ b/spec/support/stories/profile_stories.rb @@ -20,8 +20,8 @@ module ProfileStories end def with_alice_as_local_user - @alice_bio = '@alice and @bob are fictional characters commonly used as'\ - 'placeholder names in #cryptology, as well as #science and'\ + @alice_bio = '@alice and @bob are fictional characters commonly used as' \ + 'placeholder names in #cryptology, as well as #science and' \ 'engineering 📖 literature. Not affiliated with @pepe.' @alice = Fabricate( |