diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-02-17 00:02:37 -0600 |
| commit | 3d033a468748338b6036cb24bb00ea4e88656ae6 (patch) | |
| tree | a1b3bcbe599a9298f4167769ea2c197f7ca596e6 /spec/models | |
| parent | e9052ceaafff786590fb66bee4550878cfb5a0df (diff) | |
| parent | c770b503c0e75015f8ba1ca90755b19326b64c3d (diff) | |
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts: Gemfile config/locales/simple_form.pl.yml
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/media_attachment_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb index b40a641f7..d2230b6d0 100644 --- a/spec/models/media_attachment_spec.rb +++ b/spec/models/media_attachment_spec.rb @@ -92,7 +92,6 @@ RSpec.describe MediaAttachment, type: :model do it 'sets meta' do expect(media.file.meta["original"]["width"]).to eq 128 expect(media.file.meta["original"]["height"]).to eq 128 - expect(media.file.meta["original"]["aspect"]).to eq 1.0 end end |