Ability to manage and remove group as owner outside of admin area

3 files changed, 21 insertions, 0 deletions

diff --git a/features/group/group.feature b/features/group/group.feature
index a4a55a7fc26..a48affe8e02 100644
--- a/features/group/group.feature
+++ b/features/group/group.feature
@@ -24,3 +24,9 @@ Feature: Groups
     When I visit group people page
     And I select user "John" from list with role "Reporter"
     Then I should see user "John" in team list
+
+  Scenario: I should see edit group page
+    When I visit group settings page
+    And I change group name
+    Then I should see new group name
+
diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb
index c6c6b4b5e5b..5cfa4756ac3 100644
--- a/features/steps/group/group.rb
+++ b/features/steps/group/group.rb
@@ -82,6 +82,17 @@ class Groups < Spinach::FeatureSteps
     current_path.should == group_path(Group.last)
   end
 
+  And 'I change group name' do
+    fill_in 'group_name', :with => 'new-name'
+    click_button "Save group"
+  end
+
+  Then 'I should see new group name' do
+    within ".navbar-gitlab" do
+      page.should have_content "group: new-name"
+    end
+  end
+
   protected
 
   def current_group
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index 97adfd13f30..a8e68012d05 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -25,6 +25,10 @@ module SharedPaths
     visit people_group_path(current_group)
   end
 
+  When 'I visit group settings page' do
+    visit edit_group_path(current_group)
+  end
+
   # ----------------------------------------
   # Dashboard
   # ----------------------------------------