ixtlan 0.4.2 → 0.4.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/ixtlan/models/user.rb +1 -1
- data/lib/ixtlan/version.rb +1 -1
- data/spec/user_spec.rb +3 -3
- metadata +3 -3
data/lib/ixtlan/models/user.rb
CHANGED
@@ -144,7 +144,7 @@ module Ixtlan
|
|
144
144
|
|
145
145
|
model.property :id, ::DataMapper::Types::Serial, :field => "uidnumber"
|
146
146
|
|
147
|
-
model.property :login, String, :required => true, :field => "uid", :length => 4..32, :unique_index => true, :format => /^[a-zA-Z0-9]*$/, :writer => :private
|
147
|
+
model.property :login, String, :required => true, :field => "uid", :length => 4..32, :unique_index => true, :format => /^[a-zA-Z0-9._-]*$/, :writer => :private
|
148
148
|
|
149
149
|
model.property :name, String, :required => true, :format => /^[^<">]*$/, :length => 2..64, :field => "cn"
|
150
150
|
|
data/lib/ixtlan/version.rb
CHANGED
data/spec/user_spec.rb
CHANGED
@@ -98,7 +98,7 @@ describe Ixtlan::Models::User do
|
|
98
98
|
|
99
99
|
describe 'user_admin and locales/domains_admin' do
|
100
100
|
before(:each) do
|
101
|
-
@admin = User.create(:login => 'admin_user', :email => 'admin_user@example.com', :name => 'admin', :current_user => @root)
|
101
|
+
@admin = User.first(:login => 'admin_user') || User.create(:login => 'admin_user', :email => 'admin_user@example.com', :name => 'admin', :current_user => @root)
|
102
102
|
@admin.groups << @users
|
103
103
|
@admin.groups << @locales
|
104
104
|
@admin.groups << @domains
|
@@ -112,7 +112,7 @@ describe Ixtlan::Models::User do
|
|
112
112
|
end
|
113
113
|
|
114
114
|
it 'should be able to create an user' do
|
115
|
-
u = User.new(:login => '
|
115
|
+
u = User.new(:login => 'user1', :email => 'user1@example.com', :name => 'user', :current_user => @admin)
|
116
116
|
u.update_all_children(@groups)
|
117
117
|
u.save
|
118
118
|
|
@@ -127,7 +127,7 @@ describe Ixtlan::Models::User do
|
|
127
127
|
end
|
128
128
|
|
129
129
|
it 'should be able to create an user but ignore disallowed group root' do
|
130
|
-
u = User.new(:login => '
|
130
|
+
u = User.new(:login => 'user2', :email => 'user2@example.com', :name => 'user', :current_user => @admin)
|
131
131
|
|
132
132
|
groups = @groups.dup
|
133
133
|
groups[:group] << { :id => @root_group.id.to_s }
|
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 0
|
7
7
|
- 4
|
8
|
-
-
|
9
|
-
version: 0.4.
|
8
|
+
- 3
|
9
|
+
version: 0.4.3
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- mkristian
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2011-
|
17
|
+
date: 2011-02-13 00:00:00 +05:30
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|