3 files changed, 197 insertions, 40 deletions

diff --git a/spec/features/admin/admin_deploy_keys_spec.rb b/spec/features/admin/admin_deploy_keys_spec.rb
index 8bf68480785..7ce6cce0a5c 100644
--- a/spec/features/admin/admin_deploy_keys_spec.rb
+++ b/spec/features/admin/admin_deploy_keys_spec.rb
@@ -15,15 +15,36 @@ RSpec.describe 'admin deploy keys', type: :feature do
     expect(page).to have_content(another_deploy_key.title)
   end
 
-  it 'creates new deploy key' do
-    visit admin_deploy_keys_path
+  describe 'create new deploy key' do
+    before do
+      visit admin_deploy_keys_path
+      click_link 'New Deploy Key'
+    end
+
+    it 'creates new deploy key' do
+      fill_deploy_key
+      click_button 'Create'
+
+      expect_renders_new_key
+    end
+
+    it 'creates new deploy key with write access' do
+      fill_deploy_key
+      check "deploy_key_can_push"
+      click_button "Create"
+
+      expect_renders_new_key
+      expect(page).to have_content('Yes')
+    end
 
-    click_link 'New Deploy Key'
-    fill_in 'deploy_key_title', with: 'laptop'
-    fill_in 'deploy_key_key', with: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop'
-    click_button 'Create'
+    def expect_renders_new_key
+      expect(current_path).to eq admin_deploy_keys_path
+      expect(page).to have_content('laptop')
+    end
 
-    expect(current_path).to eq admin_deploy_keys_path
-    expect(page).to have_content('laptop')
+    def fill_deploy_key
+      fill_in 'deploy_key_title', with: 'laptop'
+      fill_in 'deploy_key_key', with: 'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAzrEJUIR6Y03TCE9rIJ+GqTBvgb8t1jI9h5UBzCLuK4VawOmkLornPqLDrGbm6tcwM/wBrrLvVOqi2HwmkKEIecVO0a64A4rIYScVsXIniHRS6w5twyn1MD3sIbN+socBDcaldECQa2u1dI3tnNVcs8wi77fiRe7RSxePsJceGoheRQgC8AZ510UdIlO+9rjIHUdVN7LLyz512auAfYsgx1OfablkQ/XJcdEwDNgi9imI6nAXhmoKUm1IPLT2yKajTIC64AjLOnE0YyCh6+7RFMpiMyu1qiOCpdjYwTgBRiciNRZCH8xIedyCoAmiUgkUT40XYHwLuwiPJICpkAzp7Q== user@laptop'
+    end
   end
 end
diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb
index afd42962b69..a871e370ba2 100644
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -41,6 +41,16 @@ feature 'Admin Groups', feature: true do
     end
   end
 
+  describe 'show a group' do
+    scenario 'shows the group' do
+      group = create(:group, :private)
+
+      visit admin_group_path(group)
+
+      expect(page).to have_content("Group: #{group.name}")
+    end
+  end
+
   describe 'group edit' do
     scenario 'shows the visibility level radio populated with the group visibility_level value' do
       group = create(:group, :private)
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb
index e31325ce47b..a586f8d3184 100644
--- a/spec/features/admin/admin_users_spec.rb
+++ b/spec/features/admin/admin_users_spec.rb
@@ -1,7 +1,13 @@
 require 'spec_helper'
 
-describe "Admin::Users", feature: true  do
-  before { login_as :admin }
+describe "Admin::Users", feature: true do
+  include WaitForAjax
+
+  let!(:user) do
+    create(:omniauth_user, provider: 'twitter', extern_uid: '123456')
+  end
+
+  let!(:current_user) { login_as :admin }
 
   describe "GET /admin/users" do
     before do
@@ -13,8 +19,10 @@ describe "Admin::Users", feature: true  do
     end
 
     it "has users list" do
-      expect(page).to have_content(@user.email)
-      expect(page).to have_content(@user.name)
+      expect(page).to have_content(current_user.email)
+      expect(page).to have_content(current_user.name)
+      expect(page).to have_content(user.email)
+      expect(page).to have_content(user.name)
     end
 
     describe 'Two-factor Authentication filters' do
@@ -38,8 +46,6 @@ describe "Admin::Users", feature: true  do
       end
 
       it 'counts users who have not enabled 2FA' do
-        create(:user)
-
         visit admin_users_path
 
         page.within('.filter-two-factor-disabled small') do
@@ -48,8 +54,6 @@ describe "Admin::Users", feature: true  do
       end
 
       it 'filters by users who have not enabled 2FA' do
-        user = create(:user)
-
         visit admin_users_path
         click_link '2FA Disabled'
 
@@ -108,10 +112,10 @@ describe "Admin::Users", feature: true  do
   describe "GET /admin/users/:id" do
     it "has user info" do
       visit admin_users_path
-      click_link @user.name
+      click_link user.name
 
-      expect(page).to have_content(@user.email)
-      expect(page).to have_content(@user.name)
+      expect(page).to have_content(user.email)
+      expect(page).to have_content(user.name)
     end
 
     describe 'Impersonation' do
@@ -124,7 +128,7 @@ describe "Admin::Users", feature: true  do
         end
 
         it 'does not show impersonate button for admin itself' do
-          visit admin_user_path(@user)
+          visit admin_user_path(current_user)
 
           expect(page).not_to have_content('Impersonate')
         end
@@ -156,7 +160,7 @@ describe "Admin::Users", feature: true  do
         it 'logs out of impersonated user back to original user' do
           find(:css, 'li.impersonation a').click
 
-          expect(page.find(:css, '.header-user .profile-link')['data-user']).to eql(@user.username)
+          expect(page.find(:css, '.header-user .profile-link')['data-user']).to eql(current_user.username)
         end
 
         it 'is redirected back to the impersonated users page in the admin after stopping' do
@@ -169,15 +173,15 @@ describe "Admin::Users", feature: true  do
 
     describe 'Two-factor Authentication status' do
       it 'shows when enabled' do
-        @user.update_attribute(:otp_required_for_login, true)
+        user.update_attribute(:otp_required_for_login, true)
 
-        visit admin_user_path(@user)
+        visit admin_user_path(user)
 
         expect_two_factor_status('Enabled')
       end
 
       it 'shows when disabled' do
-        visit admin_user_path(@user)
+        visit admin_user_path(user)
 
         expect_two_factor_status('Disabled')
       end
@@ -192,9 +196,8 @@ describe "Admin::Users", feature: true  do
 
   describe "GET /admin/users/:id/edit" do
     before do
-      @simple_user = create(:user)
       visit admin_users_path
-      click_link "edit_user_#{@simple_user.id}"
+      click_link "edit_user_#{user.id}"
     end
 
     it "has user edit page" do
@@ -212,45 +215,168 @@ describe "Admin::Users", feature: true  do
         click_button "Save changes"
       end
 
-      it "shows page with  new data" do
+      it "shows page with new data" do
         expect(page).to have_content('bigbang@mail.com')
         expect(page).to have_content('Big Bang')
       end
 
       it "changes user entry" do
-        @simple_user.reload
-        expect(@simple_user.name).to eq('Big Bang')
-        expect(@simple_user.is_admin?).to be_truthy
-        expect(@simple_user.password_expires_at).to be <= Time.now
+        user.reload
+        expect(user.name).to eq('Big Bang')
+        expect(user.is_admin?).to be_truthy
+        expect(user.password_expires_at).to be <= Time.now
+      end
+    end
+
+    describe 'update username to non ascii char' do
+      it do
+        fill_in 'user_username', with: '\u3042\u3044'
+        click_button('Save')
+
+        page.within '#error_explanation' do
+          expect(page).to have_content('Username')
+        end
+
+        expect(page).to have_selector(%(form[action="/admin/users/#{user.username}"]))
       end
     end
   end
 
   describe "GET /admin/users/:id/projects" do
+    let(:group) { create(:group) }
+    let!(:project) { create(:project, group: group) }
+
     before do
-      @group = create(:group)
-      @project = create(:project, group: @group)
-      @simple_user = create(:user)
-      @group.add_developer(@simple_user)
+      group.add_developer(user)
 
-      visit projects_admin_user_path(@simple_user)
+      visit projects_admin_user_path(user)
     end
 
     it "lists group projects" do
       within(:css, '.append-bottom-default + .panel') do
         expect(page).to have_content 'Group projects'
-        expect(page).to have_link @group.name, admin_group_path(@group)
+        expect(page).to have_link group.name, admin_group_path(group)
       end
     end
 
     it 'allows navigation to the group details' do
       within(:css, '.append-bottom-default + .panel') do
-        click_link @group.name
+        click_link group.name
       end
       within(:css, 'h3.page-title') do
-        expect(page).to have_content "Group: #{@group.name}"
+        expect(page).to have_content "Group: #{group.name}"
+      end
+      expect(page).to have_content project.name
+    end
+
+    it 'shows the group access level' do
+      within(:css, '.append-bottom-default + .panel') do
+        expect(page).to have_content 'Developer'
       end
-      expect(page).to have_content @project.name
+    end
+
+    it 'allows group membership to be revoked', js: true do
+      page.within(first('.group_member')) do
+        find('.btn-remove').click
+      end
+      wait_for_ajax
+
+      expect(page).not_to have_selector('.group_member')
+    end
+  end
+
+  describe 'show user attributes' do
+    it do
+      visit admin_users_path
+
+      click_link user.name
+
+      expect(page).to have_content 'Account'
+      expect(page).to have_content 'Personal projects limit'
+    end
+  end
+
+  describe 'remove users secondary email', js: true do
+    let!(:secondary_email) do
+      create :email, email: 'secondary@example.com', user: user
+    end
+
+    it do
+      visit admin_user_path(user.username)
+
+      expect(page).to have_content("Secondary email: #{secondary_email.email}")
+
+      find("#remove_email_#{secondary_email.id}").click
+
+      expect(page).not_to have_content(secondary_email.email)
+    end
+  end
+
+  describe 'show user keys' do
+    let!(:key1) do
+      create(:key, user: user, title: "ssh-rsa Key1", key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4FIEBXGi4bPU8kzxMefudPIJ08/gNprdNTaO9BR/ndy3+58s2HCTw2xCHcsuBmq+TsAqgEidVq4skpqoTMB+Uot5Uzp9z4764rc48dZiI661izoREoKnuRQSsRqUTHg5wrLzwxlQbl1MVfRWQpqiz/5KjBC7yLEb9AbusjnWBk8wvC1bQPQ1uLAauEA7d836tgaIsym9BrLsMVnR4P1boWD3Xp1B1T/ImJwAGHvRmP/ycIqmKdSpMdJXwxcb40efWVj0Ibbe7ii9eeoLdHACqevUZi6fwfbymdow+FeqlkPoHyGg3Cu4vD/D8+8cRc7mE/zGCWcQ15Var83Tczour Key1")
+    end
+
+    let!(:key2) do
+      create(:key, user: user, title: "ssh-rsa Key2", key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQSTWXhJAX/He+nG78MiRRRn7m0Pb0XbcgTxE0etArgoFoh9WtvDf36HG6tOSg/0UUNcp0dICsNAmhBKdncp6cIyPaXJTURPRAGvhI0/VDk4bi27bRnccGbJ/hDaUxZMLhhrzY0r22mjVf8PF6dvv5QUIQVm1/LeaWYsHHvLgiIjwrXirUZPnFrZw6VLREoBKG8uWvfSXw1L5eapmstqfsME8099oi+vWLR8MgEysZQmD28M73fgW4zek6LDQzKQyJx9nB+hJkKUDvcuziZjGmRFlNgSA2mguERwL1OXonD8WYUrBDGKroIvBT39zS5d9tQDnidEJZ9Y8gv5ViYP7x Key2")
+    end
+
+    it do
+      visit admin_users_path
+
+      click_link user.name
+      click_link 'SSH keys'
+
+      expect(page).to have_content(key1.title)
+      expect(page).to have_content(key2.title)
+
+      click_link key2.title
+
+      expect(page).to have_content(key2.title)
+      expect(page).to have_content(key2.key)
+
+      click_link 'Remove'
+
+      expect(page).not_to have_content(key2.title)
+    end
+  end
+
+  describe 'show user identities' do
+    it 'shows user identities' do
+      visit admin_user_identities_path(user)
+
+      expect(page).to have_content(user.name)
+      expect(page).to have_content('twitter')
+    end
+  end
+
+  describe 'update user identities' do
+    before do
+      allow(Gitlab::OAuth::Provider).to receive(:providers).and_return([:twitter, :twitter_updated])
+    end
+
+    it 'modifies twitter identity' do
+      visit admin_user_identities_path(user)
+
+      find('.table').find(:link, 'Edit').click
+      fill_in 'identity_extern_uid', with: '654321'
+      select 'twitter_updated', from: 'identity_provider'
+      click_button 'Save changes'
+
+      expect(page).to have_content(user.name)
+      expect(page).to have_content('twitter_updated')
+      expect(page).to have_content('654321')
+    end
+  end
+
+  describe 'remove user with identities' do
+    it 'removes user with twitter identity' do
+      visit admin_user_identities_path(user)
+
+      click_link 'Delete'
+
+      expect(page).to have_content(user.name)
+      expect(page).not_to have_content('twitter')
     end
   end
 end