3 files changed, 37 insertions, 0 deletions
diff --git a/features/admin/applications.feature b/features/admin/applications.feature
new file mode 100644
index 00000000000..2a00e1666c0
--- /dev/null
+++ b/features/admin/applications.feature
@@ -0,0 +1,18 @@
+@admin
+Feature: Admin Applications
+  Background:
+    Given I sign in as an admin
+    And I visit applications page
+    
+  Scenario: I can manage application
+    Then I click on new application button
+    And I should see application form
+    Then I fill application form out and submit
+    And I see application
+    Then I click edit
+    And I see edit application form
+    Then I change name of application and submit
+    And I see that application was changed
+    Then I visit applications page
+    And I click to remove application
+    Then I see that application is removed
+\ No newline at end of file
diff --git a/features/admin/settings.feature b/features/admin/settings.feature
new file mode 100644
index 00000000000..8fdf0575c2c
--- /dev/null
+++ b/features/admin/settings.feature
@@ -0,0 +1,9 @@
+@admin
+Feature: Admin Settings
+  Background:
+    Given I sign in as an admin
+    And I visit admin settings page
+
+  Scenario: Change application settings
+    When I modify settings and save form
+    Then I should see application settings saved
diff --git a/features/admin/users.feature b/features/admin/users.feature
index 278f6a43e94..1a8720dd77e 100644
--- a/features/admin/users.feature
+++ b/features/admin/users.feature
@@ -35,3 +35,13 @@ Feature: Admin Users
     And I see the secondary email
     When I click remove secondary email
     Then I should not see secondary email anymore
+
+  Scenario: Show user keys
+    Given user "Pete" with ssh keys
+    And I visit admin users page
+    And click on user "Pete"
+    Then I should see key list
+    And I click on the key title
+    Then I should see key details
+    And I click on remove key
+    Then I should see the key removed