Download as
Browse Code »

Commit fb470e8e2aff80a16b56f9c5422c04e74dcb213c

Authored by Dmitriy Zaporozhets
1 parent a0bd09ab
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Validate username uniq in scope of namespace

Showing 4 changed files with 18 additions and 12 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @fb470e8
... ... @@ -67,6 +67,8 @@ class User < ActiveRecord::Base
67 67 message: "only letters, digits & '_' '-' '.' allowed. Letter should be first" }
68 68  
69 69  
  70 + validate :namespace_uniq, if: ->(user) { user.username_changed? }
  71 +
70 72 before_validation :generate_password, on: :create
71 73 before_save :ensure_authentication_token
72 74 alias_attribute :private_token, :authentication_token
... ... @@ -135,6 +137,12 @@ class User < ActiveRecord::Base
135 137 end
136 138 end
137 139  
  140 + def namespace_uniq
  141 + namespace_name = self.username
  142 + if Namespace.find_by_path(namespace_name)
  143 + self.errors.add :username, "already exist"
  144 + end
  145 + end
138 146  
139 147 # Namespaces user has access to
140 148 def namespaces
... ...
app/views/profiles/account.html.haml
  Diff comments   View file @fb470e8
... ... @@ -69,7 +69,7 @@
69 69 %i.icon-ok
70 70 Saved
71 71 %span.update-failed.cred.hide
72   - %i.icon-ok
  72 + %i.icon-remove
73 73 Failed
74 74 %ul.cred
75 75 %li It will change web url for personal projects.
... ...
features/steps/project/project_milestones.rb
  Diff comments   View file @fb470e8
... ... @@ -50,12 +50,12 @@ class ProjectMilestones < Spinach::FeatureSteps
50 50 end
51 51  
52 52 Then "I should see 3 issues" do
53   - page.should have_selector('.milestone-issue-filter li', count: 4)
54   - page.should have_selector('.milestone-issue-filter li.hide', count: 1)
  53 + page.should have_selector('.milestone-issue-filter .well-list li', count: 4)
  54 + page.should have_selector('.milestone-issue-filter .well-list li.hide', count: 1)
55 55 end
56 56  
57 57 Then "I should see 4 issues" do
58   - page.should have_selector('.milestone-issue-filter li', count: 4)
59   - page.should_not have_selector('.milestone-issue-filter li.hide')
  58 + page.should have_selector('.milestone-issue-filter .well-list li', count: 4)
  59 + page.should_not have_selector('.milestone-issue-filter .well-list li.hide')
60 60 end
61 61 end
... ...
lib/tasks/travis.rake
  Diff comments   View file @fb470e8
1   -task :travis do
2   - ["rake spinach", "rake spec"].each do |cmd|
3   - puts "Starting to run #{cmd}..."
4   - system("export DISPLAY=:99.0 && bundle exec #{cmd}")
5   - raise "#{cmd} failed!" unless $?.exitstatus == 0
6   - end
7   -end
  1 +desc "Travis run tests"
  2 +task :travis => [
  3 + :spinach,
  4 + :spec
  5 +]
... ...