2 files changed, 43 insertions, 1 deletions
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index 6b26e6693..c2141766e 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -16,9 +16,12 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
   end
 
   describe 'POST #create' do
+    let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s }
+
     before do
       Setting.open_registrations = true
       request.env["devise.mapping"] = Devise.mappings[:user]
+      request.headers["Accept-Language"] = accept_language
       post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678' } }
     end
 
@@ -27,7 +30,9 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
     end
 
     it 'creates user' do
-      expect(User.find_by(email: 'test@example.com')).to_not be_nil
+      user = User.find_by(email: 'test@example.com')
+      expect(user).to_not be_nil
+      expect(user.locale).to eq(accept_language)
     end
   end
 end
diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb
new file mode 100644
index 000000000..ebf6aa006
--- /dev/null
+++ b/spec/controllers/media_controller_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe MediaController do
+  describe '#show' do
+    it 'redirects to the file url when attached to a status' do
+      status = Fabricate(:status)
+      media_attachment = Fabricate(:media_attachment, status: status)
+      get :show, params: { id: media_attachment.to_param }
+
+      expect(response).to redirect_to(media_attachment.file.url(:original))
+    end
+
+    it 'responds with missing when there is not an attached status' do
+      media_attachment = Fabricate(:media_attachment, status: nil)
+      get :show, params: { id: media_attachment.to_param }
+
+      expect(response).to have_http_status(:missing)
+    end
+
+    it 'raises when shortcode cant be found' do
+      get :show, params: { id: 'missing' }
+
+      expect(response).to have_http_status(:missing)
+    end
+
+    it 'raises when not permitted to view' do
+      status = Fabricate(:status)
+      media_attachment = Fabricate(:media_attachment, status: status)
+      allow_any_instance_of(Status).to receive(:permitted?).and_return(false)
+      get :show, params: { id: media_attachment.to_param }
+
+      expect(response).to have_http_status(:missing)
+    end
+  end
+end