summaryrefslogtreecommitdiff
path: root/features/project
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-09-10 06:35:23 -0700
committerNihad Abbasov <narkoz.2008@gmail.com>2012-09-10 06:35:23 -0700
commitb58155113b46690d9390597f9f1feccf44b00989 (patch)
treefded841ab9308d4636e21d51c1c808cbf312b87d /features/project
parent698500dd786cc931cabeb0f44087c0cd11bd0131 (diff)
downloadgitlab-ce-b58155113b46690d9390597f9f1feccf44b00989.tar.gz
add spinach steps for remaining features
Diffstat (limited to 'features/project')
-rw-r--r--features/project/deploy_keys.feature0
-rw-r--r--features/project/merge_requests.feature6
-rw-r--r--features/project/network.feature5
-rw-r--r--features/project/project.feature13
-rw-r--r--features/project/snippets.feature0
-rw-r--r--features/project/team_management.feature15
-rw-r--r--features/project/wall.feature5
-rw-r--r--features/project/web_hooks.feature0
-rw-r--r--features/project/wiki.feature6
9 files changed, 26 insertions, 24 deletions
diff --git a/features/project/deploy_keys.feature b/features/project/deploy_keys.feature
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/features/project/deploy_keys.feature
+++ /dev/null
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index 54b6ccde7f9..80f00986466 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -1,10 +1,10 @@
-Feature: Merge Requests
+Feature: Project Merge Requests
Background:
- Given I signin as a user
+ Given I sign in as a user
And I own project "Shop"
And project "Shop" have "Bug NS-04" open merge request
And project "Shop" have "Feature NS-03" closed merge request
- And I visit project "Shop" merge requests page
+ And I visit project "Shop" merge requests page
Scenario: I should see open merge requests
Then I should see "Bug NS-04" in merge requests
diff --git a/features/project/network.feature b/features/project/network.feature
index 61c05eb367e..31ce5ad3279 100644
--- a/features/project/network.feature
+++ b/features/project/network.feature
@@ -1,10 +1,9 @@
-@javascript
Feature: Project Network Graph
-
Background:
- Given I signin as a user
+ Given I sign in as a user
And I own project "Shop"
And I visit project "Shop" network page
+ @javascript
Scenario: I should see project network
Then page should have network graph
diff --git a/features/project/project.feature b/features/project/project.feature
index 895a928ff81..1c9f201df50 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -1,11 +1,14 @@
-Feature: Project
+Feature: Projects
Background:
Given I signin as a user
And I own project "Shop"
- And I visit project "Shop" page
+ And I visit project "Shop" page
- Scenario: I should see project activity
+ # @wip
+ # Scenario: I should see project activity
- Scenario: I edit project
+ # @wip
+ # Scenario: I edit project
- Scenario: I visit attachments
+ # @wip
+ # Scenario: I visit attachments
diff --git a/features/project/snippets.feature b/features/project/snippets.feature
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/features/project/snippets.feature
+++ /dev/null
diff --git a/features/project/team_management.feature b/features/project/team_management.feature
index b5b485e2dc0..ae0c459f333 100644
--- a/features/project/team_management.feature
+++ b/features/project/team_management.feature
@@ -1,11 +1,11 @@
Feature: Project Team management
- Background:
- Given I signin as a user
+ Background:
+ Given I sign in as a user
And I own project "Shop"
- And gitlab user "Mike"
- And gitlab user "Sam"
+ And gitlab user "Mike"
+ And gitlab user "Sam"
And "Sam" is "Shop" developer
- And I visit project "Shop" team page
+ And I visit project "Shop" team page
Scenario: See all team members
Then I should be able to see myself in team
@@ -20,7 +20,7 @@ Feature: Project Team management
Scenario: Update user access
Given I should see "Sam" in team list as "Developer"
And I change "Sam" role to "Reporter"
- Then I visit project "Shop" team page
+ Then I visit project "Shop" team page
And I should see "Sam" in team list as "Reporter"
Scenario: View team member profile
@@ -30,6 +30,5 @@ Feature: Project Team management
Scenario: Cancel team member
Given I click link "Sam"
And I click link "Remove from team"
- Then I visit project "Shop" team page
+ Then I visit project "Shop" team page
And I should not see "Sam" in team list
-
diff --git a/features/project/wall.feature b/features/project/wall.feature
index ed675e2c477..c92dbf82db5 100644
--- a/features/project/wall.feature
+++ b/features/project/wall.feature
@@ -7,11 +7,12 @@ Feature: Project Wall
Background:
Given I signin as a user
And I own project "Shop"
- And I visit project "Shop" wall page
+ And I visit project "Shop" wall page
+ @javascript
Scenario: Write comment
Given I write new comment "my special test message"
Then I should see project wall note "my special test message"
- Then I visit project "Shop" wall page
+ Then I visit project "Shop" wall page
And I should see project wall note "my special test message"
diff --git a/features/project/web_hooks.feature b/features/project/web_hooks.feature
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/features/project/web_hooks.feature
+++ /dev/null
diff --git a/features/project/wiki.feature b/features/project/wiki.feature
index 4441ada2847..51370565a3b 100644
--- a/features/project/wiki.feature
+++ b/features/project/wiki.feature
@@ -1,6 +1,6 @@
-Feature: Wiki
- Background:
- Given I signin as a user
+Feature: Project Wiki
+ Background:
+ Given I sign in as a user
And I own project "Shop"
Given I visit project wiki page