Skip to content

Commit ae3816f

Browse files
move create & update account actions with services to spree (#532)
* move create & update account actions with services to spree * restore deleted spec * restart build with updated spree * restart build with updated spree * Require Spree 4.3 * fix gemspec * restart build Co-authored-by: Damian Legawiec <[email protected]>
1 parent b3dd1cd commit ae3816f

File tree

8 files changed

+32
-85
lines changed

8 files changed

+32
-85
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,10 @@ env:
2323
- DB=postgres
2424

2525
gemfile:
26-
- gemfiles/spree_4_1.gemfile
26+
- gemfiles/spree_4_3.gemfile
2727
- gemfiles/spree_master.gemfile
2828

2929
jobs:
30-
exclude:
31-
- rvm: 3.0
32-
gemfile: gemfiles/spree_4_1.gemfile
3330
allow_failures:
3431
- gemfile: gemfiles/spree_master.gemfile
3532

Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
appraise 'spree-4-1' do
1+
appraise 'spree-4-3' do
22
gem 'rails-controller-testing'
3-
gem 'spree', '~> 4.1'
3+
gem 'spree', github: 'spree/spree', branch: 'master'
44
end
55

66
appraise 'spree-master' do

app/services/spree/account/create.rb

Lines changed: 0 additions & 19 deletions
This file was deleted.

app/services/spree/account/update.rb

Lines changed: 0 additions & 17 deletions
This file was deleted.

gemfiles/spree_4_1.gemfile renamed to gemfiles/spree_4_3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
source "https://rubygems.org"
44

55
gem "rails-controller-testing"
6-
gem "spree", "~> 4.1"
6+
gem "spree", github: "spree/spree", branch: "master"
77

88
gemspec path: "../"

lib/controllers/api/spree/api/v2/storefront/account_controller_decorator.rb

Lines changed: 0 additions & 41 deletions
This file was deleted.

spec/models/user_spec.rb

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,33 @@
2727
end
2828
end
2929

30+
describe 'validations' do
31+
context 'email' do
32+
let(:user) { build(:user, email: nil) }
33+
34+
it 'cannot be empty' do
35+
expect(user.valid?).to be false
36+
expect(user.errors.messages[:email].first).to eq "can't be blank"
37+
end
38+
end
39+
40+
context 'password' do
41+
let(:user) { build(:user, password_confirmation: nil) }
42+
43+
it 'password confirmation cannot be empty' do
44+
expect(user.valid?).to be false
45+
expect(user.errors.messages[:password_confirmation].first).to eq "doesn't match Password"
46+
end
47+
48+
let(:user) { build(:user, password: 'pass1234', password_confirmation: 'pass') }
49+
50+
it 'passwords has to be equal to password confirmation' do
51+
expect(user.valid?).to be false
52+
expect(user.errors.messages[:password_confirmation].first).to eq "doesn't match Password"
53+
end
54+
end
55+
end
56+
3057
context '#destroy' do
3158
it 'will soft delete with uncompleted orders' do
3259
order = build(:order)

spree_auth_devise.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
3333
s.add_dependency 'devise', '~> 4.7'
3434
s.add_dependency 'devise-encryptable', '0.2.0'
3535

36-
spree_version = '>= 4.1', '< 5.0'
36+
spree_version = '>= 4.3.0.alpha'
3737
s.add_dependency 'spree_core', spree_version
3838
s.add_dependency 'spree_extension'
3939

0 commit comments

Comments
 (0)