From ae1fac006206ab28cd7cba63ab85c07a27f3d606 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 5 Sep 2016 17:46:36 +0200 Subject: Add API to upload media attachments --- spec/controllers/api/media_controller_spec.rb | 34 +++++++++++++++++++++++ spec/controllers/api/statuses_controller_spec.rb | 4 +-- spec/fabricators/media_attachment_fabricator.rb | 6 ++++ spec/fixtures/files/attachment.jpg | Bin 0 -> 61022 bytes spec/helpers/api/media_helper_spec.rb | 15 ++++++++++ spec/models/media_attachment_spec.rb | 5 ++++ spec/rails_helper.rb | 2 ++ spec/spec_helper.rb | 12 ++++++++ 8 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 spec/controllers/api/media_controller_spec.rb create mode 100644 spec/fabricators/media_attachment_fabricator.rb create mode 100644 spec/fixtures/files/attachment.jpg create mode 100644 spec/helpers/api/media_helper_spec.rb create mode 100644 spec/models/media_attachment_spec.rb (limited to 'spec') diff --git a/spec/controllers/api/media_controller_spec.rb b/spec/controllers/api/media_controller_spec.rb new file mode 100644 index 000000000..2f216c1d5 --- /dev/null +++ b/spec/controllers/api/media_controller_spec.rb @@ -0,0 +1,34 @@ +require 'rails_helper' + +RSpec.describe Api::MediaController, type: :controller do + render_views + + let(:user) { Fabricate(:user, account: Fabricate(:account, username: 'alice')) } + let(:token) { double acceptable?: true, resource_owner_id: user.id } + + before do + allow(controller).to receive(:doorkeeper_token) { token } + end + + describe 'POST #create' do + before do + post :create, params: { file: fixture_file_upload('files/attachment.jpg', 'image/jpeg') } + end + + it 'returns http success' do + expect(response).to have_http_status(:success) + end + + it 'creates a media attachment' do + expect(MediaAttachment.first).to_not be_nil + end + + it 'uploads a file' do + expect(MediaAttachment.first).to have_attached_file(:file) + end + + it 'returns media ID in JSON' do + expect(body_as_json[:id]).to eq MediaAttachment.first.id + end + end +end diff --git a/spec/controllers/api/statuses_controller_spec.rb b/spec/controllers/api/statuses_controller_spec.rb index 15fdbdaff..64e201f3c 100644 --- a/spec/controllers/api/statuses_controller_spec.rb +++ b/spec/controllers/api/statuses_controller_spec.rb @@ -64,7 +64,7 @@ RSpec.describe Api::StatusesController, type: :controller do end it 'return json with updated attributes' do - hash_body = JSON.parse(response.body).with_indifferent_access + hash_body = body_as_json expect(hash_body[:reblog][:id]).to eq status.id expect(hash_body[:reblog][:reblogs_count]).to eq 1 @@ -92,7 +92,7 @@ RSpec.describe Api::StatusesController, type: :controller do end it 'return json with updated attributes' do - hash_body = JSON.parse(response.body).with_indifferent_access + hash_body = body_as_json expect(hash_body[:id]).to eq status.id expect(hash_body[:favourites_count]).to eq 1 diff --git a/spec/fabricators/media_attachment_fabricator.rb b/spec/fabricators/media_attachment_fabricator.rb new file mode 100644 index 000000000..42aa5ab02 --- /dev/null +++ b/spec/fabricators/media_attachment_fabricator.rb @@ -0,0 +1,6 @@ +Fabricator(:media_attachment) do + status_id 1 + file "" + remote_url "MyString" + account_id 1 +end diff --git a/spec/fixtures/files/attachment.jpg b/spec/fixtures/files/attachment.jpg new file mode 100644 index 000000000..f1d40539a Binary files /dev/null and b/spec/fixtures/files/attachment.jpg differ diff --git a/spec/helpers/api/media_helper_spec.rb b/spec/helpers/api/media_helper_spec.rb new file mode 100644 index 000000000..5813264ad --- /dev/null +++ b/spec/helpers/api/media_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Api::MediaHelper. For example: +# +# describe Api::MediaHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Api::MediaHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb new file mode 100644 index 000000000..0a1627684 --- /dev/null +++ b/spec/models/media_attachment_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe MediaAttachment, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index e9c732f6f..3c810eb9e 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -6,6 +6,7 @@ abort("The Rails environment is running in production mode!") if Rails.env.produ require 'spec_helper' require 'rspec/rails' require 'webmock/rspec' +require 'paperclip/matchers' ActiveRecord::Migration.maintain_test_schema! WebMock.disable_net_connect! @@ -19,6 +20,7 @@ RSpec.configure do |config| config.include Devise::Test::ControllerHelpers, type: :controller config.include Devise::TestHelpers, type: :view + config.include Paperclip::Shoulda::Matchers end RSpec::Sidekiq.configure do |config| diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index d6c1dc95b..8d77b39f3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,4 +12,16 @@ RSpec.configure do |config| config.mock_with :rspec do |mocks| mocks.verify_partial_doubles = true end + + config.after(:suite) do + FileUtils.rm_rf(Dir["#{Rails.root}/spec/test_files/"]) + end +end + +def body_as_json + json_str_to_hash(response.body) +end + +def json_str_to_hash(str) + JSON.parse(str).with_indifferent_access end -- cgit