Layout for Users Groups and Projects on admin area

2 files changed, 8 insertions, 5 deletions

diff --git a/features/admin/projects.feature b/features/admin/projects.feature
index c5ee80136c8..8929bcf8d80 100644
--- a/features/admin/projects.feature
+++ b/features/admin/projects.feature
@@ -10,10 +10,11 @@ Feature: Admin Projects
     Then I should see all non-archived projects
     And I should not see project "Archive"
 
+  @javascript
   Scenario: I should see all projects in the list
     Given archived project "Archive"
     When I visit admin projects page
-    And I check "Show archived projects"
+    And I select "Show archived projects"
     Then I should see all projects
     And I should see "archived" label
 
@@ -22,6 +23,7 @@ Feature: Admin Projects
     And I click on first project
     Then I should see project details
 
+  @javascript
   Scenario: Transfer project
     Given group 'Web'
     And I visit admin project page
diff --git a/features/steps/admin/projects.rb b/features/steps/admin/projects.rb
index a7a28755a6c..d77945a6b9c 100644
--- a/features/steps/admin/projects.rb
+++ b/features/steps/admin/projects.rb
@@ -18,9 +18,9 @@ class Spinach::Features::AdminProjects < Spinach::FeatureSteps
     end
   end
 
-  step 'I check "Show archived projects"' do
-    page.check 'Show archived projects'
-    click_button "Search"
+  step 'I select "Show archived projects"' do
+    find(:css, '#sort-projects-dropdown').click
+    click_link 'Show archived projects'
   end
 
   step 'I should see "archived" label' do
@@ -45,7 +45,8 @@ class Spinach::Features::AdminProjects < Spinach::FeatureSteps
   step 'I transfer project to group \'Web\'' do
     allow_any_instance_of(Projects::TransferService).
       to receive(:move_uploads_to_new_namespace).and_return(true)
-    find(:xpath, "//input[@id='new_namespace_id']").set group.id
+    click_button 'Search for Namespace'
+    click_link 'group: web'
     click_button 'Transfer'
   end