summaryrefslogtreecommitdiff
path: root/features
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-24 14:17:11 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-24 14:17:11 +0000
commitaa712e2b36e6acd450038dfd39100a03d02af66e (patch)
tree0d18e5599d027e70cc79754bcbc5a708725a6b47 /features
parentd84ca3e81530415e7d3c03c8cf7a8db5071b0bcb (diff)
parenta1294e5aabcfcc50423d78184b1bb34031754519 (diff)
downloadgitlab-ce-aa712e2b36e6acd450038dfd39100a03d02af66e.tar.gz
Merge branch 'new-project-header-redesign' into 'master'
Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
Diffstat (limited to 'features')
-rw-r--r--features/project/create.feature1
-rw-r--r--features/project/star.feature1
-rw-r--r--features/steps/project/create.rb6
-rw-r--r--features/steps/project/star.rb2
4 files changed, 7 insertions, 3 deletions
diff --git a/features/project/create.feature b/features/project/create.feature
index a86079143e5..27136798e36 100644
--- a/features/project/create.feature
+++ b/features/project/create.feature
@@ -1,3 +1,4 @@
+@project-create
Feature: Project Create
In order to get access to project sections
A user with ability to create a project
diff --git a/features/project/star.feature b/features/project/star.feature
index a45f9c470ea..618f44fe6dc 100644
--- a/features/project/star.feature
+++ b/features/project/star.feature
@@ -1,3 +1,4 @@
+@project-stars
Feature: Project Star
Scenario: New projects have 0 stars
Given public project "Community"
diff --git a/features/steps/project/create.rb b/features/steps/project/create.rb
index f90218f3791..8a0e8fc2b6c 100644
--- a/features/steps/project/create.rb
+++ b/features/steps/project/create.rb
@@ -26,7 +26,8 @@ class Spinach::Features::ProjectCreate < Spinach::FeatureSteps
end
step 'I click on HTTP' do
- click_button 'HTTP'
+ find('#clone-dropdown').click
+ find('#http-selector').click
end
step 'Remote url should update to http link' do
@@ -34,7 +35,8 @@ class Spinach::Features::ProjectCreate < Spinach::FeatureSteps
end
step 'If I click on SSH' do
- click_button 'SSH'
+ find('#clone-dropdown').click
+ find('#ssh-selector').click
end
step 'Remote url should update to ssh link' do
diff --git a/features/steps/project/star.rb b/features/steps/project/star.rb
index bd2e0619cdd..9f7c748a3b7 100644
--- a/features/steps/project/star.rb
+++ b/features/steps/project/star.rb
@@ -32,6 +32,6 @@ class Spinach::Features::ProjectStar < Spinach::FeatureSteps
protected
def has_n_stars(n)
- expect(page).to have_css(".star-btn .count", text: n, visible: true)
+ expect(page).to have_css(".star-count", text: n, visible: true)
end
end