Fixing more configuration issues with ActionCable

rebase/4.0.0rc2
Eugen Rochko 2016-08-18 18:39:35 +02:00
parent 5a8c149f6b
commit 8985f8e66c
4 changed files with 9 additions and 5 deletions

View File

@ -3,11 +3,11 @@ class ApplicationController < ActionController::Base
# For APIs, you may want to use :null_session instead.
protect_from_forgery with: :exception
force_ssl if: "ENV['LOCAL_HTTPS'] == 'true'"
force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'"
# Profiling
before_action do
if (current_user && current_user.admin?) || Rails.env == 'development'
if (current_user && current_user.admin?) || Rails.env.development?
Rack::MiniProfiler.authorize_request
end
end

View File

@ -80,4 +80,6 @@ Rails.application.configure do
}
config.action_mailer.delivery_method = :smtp
config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
end

View File

@ -4,6 +4,4 @@ Rails.application.configure do
config.x.use_https = ENV['LOCAL_HTTPS'] == 'true'
config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://' }
config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
end

View File

@ -1,7 +1,7 @@
require 'rails_helper'
RSpec.describe Api::SalmonController, type: :controller do
let(:account) { Fabricate(:account, username: 'catsrgr8', user: Fabricate(:user)) }
let(:account) { Fabricate(:user, account: Fabricate(:account, username: 'catsrgr8')).account }
before do
stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))
@ -16,6 +16,10 @@ RSpec.describe Api::SalmonController, type: :controller do
post :update, params: { id: account.id }
end
it 'contains XML in the request body' do
expect(request.body.read).to be_a String
end
it 'returns http success' do
expect(response).to have_http_status(:success)
end