scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-06 05:04:35 +08:00
Code Issues Projects Releases Packages Wiki Activity

Update Gemfile for correct devise version, minorly fix services spec

Browse source
This commit is contained in:
Luka Murn 2017-10-02 11:37:58 +02:00
parent 6e082ccc24
commit fbddf4da79
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -70,7 +70,9 @@ gem 'paperclip', '~> 5.1' # File attachment, image attachment library
gem 'aws-sdk', '~> 2' gem 'aws-sdk', '~> 2'
gem 'delayed_job_active_record' gem 'delayed_job_active_record'
gem 'devise-async' gem 'devise-async',
git: 'https://github.com/mhfs/devise-async.git',
branch: 'devise-4.x'
gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
gem 'tinymce-rails', '~> 4.6.4' # Rich text editor gem 'tinymce-rails', '~> 4.6.4' # Rich text editor

12
Gemfile.lock
View file

@ -21,6 +21,14 @@ GIT
activejob (>= 4.2) activejob (>= 4.2)
paperclip (>= 3.3) paperclip (>= 3.3)
GIT
remote: https://github.com/mhfs/devise-async.git
revision: 177f6363a002f7ff28f1d289c8cab7ad8d9cb8c5
branch: devise-4.x
specs:
devise-async (0.10.2)
devise (>= 4.0)
GIT GIT
remote: https://github.com/phatworx/devise_security_extension.git remote: https://github.com/phatworx/devise_security_extension.git
revision: b2ee978af7d49f0fb0e7271c6ac074dfb4d39353 revision: b2ee978af7d49f0fb0e7271c6ac074dfb4d39353
@ -175,8 +183,6 @@ GEM
railties (>= 4.1.0, < 5.2) railties (>= 4.1.0, < 5.2)
responders responders
warden (~> 1.2.3) warden (~> 1.2.3)
devise-async (0.7.0)
devise (>= 2.2)
devise_invitable (1.7.2) devise_invitable (1.7.2)
actionmailer (>= 4.1.0) actionmailer (>= 4.1.0)
devise (>= 4.0.0) devise (>= 4.0.0)
@ -487,7 +493,7 @@ DEPENDENCIES
delayed_job_active_record delayed_job_active_record
delayed_paperclip! delayed_paperclip!
devise (~> 4.3.0) devise (~> 4.3.0)
devise-async devise-async!
devise_invitable devise_invitable
devise_security_extension! devise_security_extension!
factory_girl_rails factory_girl_rails

4
spec/services/client_api/teams/create_service_spec.rb
View file

@ -28,11 +28,13 @@ describe ClientApi::Teams::CreateService do
expect(team_n.users.take).to eq user expect(team_n.users.take).to eq user
end end
it 'should return error response if not all params are present' do it 'should return error response if params = {}' do
service = CreateService.new(current_user: user, params: {}) service = CreateService.new(current_user: user, params: {})
result = service.execute result = service.execute
expect(result[:status]).to eq :error expect(result[:status]).to eq :error
end
it 'should return error response if params are missing :name attribute' do
service = CreateService.new( service = CreateService.new(
current_user: user, current_user: user,
params: { description: team.description } params: { description: team.description }