Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

wth - paperclip upgrade #760

Merged
merged 1 commit into from
Nov 30, 2016
Merged

wth - paperclip upgrade #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ gem 'nprogress-rails'
gem 'obis-net-ldap'
gem 'omniauth'
gem 'omniauth-shibboleth'
gem 'paperclip', '~> 3.4.1'
gem 'paperclip', '~> 4.3', '>= 4.3.7'
gem 'pdfkit'
gem 'prawn', '0.12.0'
gem 'premailer-rails'
Expand Down
17 changes: 9 additions & 8 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,10 @@ GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.99)
mime-types (2.99.3)
mimemagic (0.3.0)
mini_portile2 (2.1.0)
minitest (5.9.0)
minitest (5.9.1)
momentjs-rails (2.10.6)
railties (>= 3.1)
multi_json (1.11.2)
Expand Down Expand Up @@ -288,12 +289,12 @@ GEM
omniauth (>= 1.0.0)
options (2.3.2)
orm_adapter (0.5.0)
paperclip (3.4.2)
activemodel (>= 3.0.0)
activerecord (>= 3.0.0)
activesupport (>= 3.0.0)
cocaine (~> 0.5.0)
paperclip (4.3.7)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
parallel (1.6.1)
parallel_tests (2.3.1)
parallel
Expand Down Expand Up @@ -564,7 +565,7 @@ DEPENDENCIES
obis-net-ldap
omniauth
omniauth-shibboleth
paperclip (~> 3.4.1)
paperclip (~> 4.3, >= 4.3.7)
parallel_tests
pdfkit
prawn (= 0.12.0)
Expand Down
1 change: 1 addition & 0 deletions app/models/document.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class Document < ActiveRecord::Base
has_and_belongs_to_many :sub_service_requests
belongs_to :protocol
has_attached_file :document #, :preserve_files => true
validates_attachment :document, :content_type => {:content_type => %w(text/plain image/jpeg image/jpg image/png application/pdf application/msword application/vnd.openxmlformats-officedocument.wordprocessingml.document)}

attr_accessible :document
attr_accessible :doc_type
Expand Down
4 changes: 2 additions & 2 deletions spec/controllers/dashboard/documents/post_create_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
service_request = create(:service_request_without_validations, protocol: @protocol)
@ssr = create(:sub_service_request_without_validations, service_request: service_request, organization: organization, status: 'draft')
create(:super_user, identity: logged_in_user, organization: organization)
document = Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'txt/plain')
document = Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'text/plain')
params = { org_ids: [organization.id], protocol_id: @protocol.id, document: { protocol: @protocol, doc_type: 'Protocol', document: document } }

xhr :post, :create, params, format: :js
Expand Down Expand Up @@ -73,7 +73,7 @@
service_request = create(:service_request_without_validations, protocol: @protocol)
@ssr = create(:sub_service_request_without_validations, service_request: service_request, organization: organization, status: 'draft')
create(:super_user, identity: logged_in_user, organization: organization)
@document = Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'txt/plain')
@document = Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'text/plain')
params = { org_ids: [organization.id], protocol_id: @protocol.id, document: { protocol: @protocol, doc_type: 'Protocol', document: @document } }

xhr :post, :create, params, format: :js
Expand Down
5 changes: 3 additions & 2 deletions spec/controllers/documents/post_create_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,11 @@
it 'should create document' do
protocol = create(:protocol_without_validations, primary_pi: logged_in_user)
sr = create(:service_request_without_validations, protocol: protocol)
doc_params = { doc_type: 'Neurology', document: Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'txt/plain') }
doc_params = { doc_type: 'Neurology', document: Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'text/plain') }

session[:service_request_id] = sr.id


xhr :post, :create, {
protocol_id: protocol.id,
document: doc_params
Expand All @@ -86,7 +87,7 @@
sr = create(:service_request_without_validations, protocol: protocol)
org = create(:organization)
ssr = create(:sub_service_request_without_validations, organization: org, service_request: sr)
doc_params = { doc_type: 'Neurology', document: Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'txt/plain') }
doc_params = { doc_type: 'Neurology', document: Rack::Test::UploadedFile.new(File.join('doc', 'musc_installation_example.txt'),'text/plain') }

session[:service_request_id] = sr.id

Expand Down