summaryrefslogtreecommitdiff
path: root/features/steps/dashboard
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-11 17:48:32 +0100
committerAlfredo Sumaran <alfredo@gitlab.com>2016-08-13 00:57:40 -0500
commitf668da11cb225a9b2c2f1d3ba9d1e9fb2797d4f9 (patch)
tree48f54ed40d288979f1c14c90c79cc456fe6010b7 /features/steps/dashboard
parent2675c9d632c9560a94e98cd3830e2dfdfbbc2bd4 (diff)
downloadgitlab-ce-f668da11cb225a9b2c2f1d3ba9d1e9fb2797d4f9.tar.gz
Updated tests
Diffstat (limited to 'features/steps/dashboard')
-rw-r--r--features/steps/dashboard/event_filters.rb6
-rw-r--r--features/steps/dashboard/issues.rb5
-rw-r--r--features/steps/dashboard/merge_requests.rb5
-rw-r--r--features/steps/dashboard/new_project.rb2
4 files changed, 18 insertions, 0 deletions
diff --git a/features/steps/dashboard/event_filters.rb b/features/steps/dashboard/event_filters.rb
index 726b37cfde5..97b17abb470 100644
--- a/features/steps/dashboard/event_filters.rb
+++ b/features/steps/dashboard/event_filters.rb
@@ -4,26 +4,32 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
include SharedProject
step 'I should see push event' do
+ sleep 1
expect(page).to have_selector('span.pushed')
end
step 'I should not see push event' do
+ sleep 1
expect(page).not_to have_selector('span.pushed')
end
step 'I should see new member event' do
+ sleep 1
expect(page).to have_selector('span.joined')
end
step 'I should not see new member event' do
+ sleep 1
expect(page).not_to have_selector('span.joined')
end
step 'I should see merge request event' do
+ sleep 1
expect(page).to have_selector('span.accepted')
end
step 'I should not see merge request event' do
+ sleep 1
expect(page).not_to have_selector('span.accepted')
end
diff --git a/features/steps/dashboard/issues.rb b/features/steps/dashboard/issues.rb
index 8706f0e8e78..39c65bb6cde 100644
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
@@ -43,9 +43,14 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
step 'I click "All" link' do
find(".js-author-search").click
+ expect(page).to have_selector(".dropdown-menu-author li a")
find(".dropdown-menu-author li a", match: :first).click
+ expect(page).not_to have_selector(".dropdown-menu-author li a")
+
find(".js-assignee-search").click
+ expect(page).to have_selector(".dropdown-menu-assignee li a")
find(".dropdown-menu-assignee li a", match: :first).click
+ expect(page).not_to have_selector(".dropdown-menu-assignee li a")
end
def should_see(issue)
diff --git a/features/steps/dashboard/merge_requests.rb b/features/steps/dashboard/merge_requests.rb
index 06db36c7014..6777101fb15 100644
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
@@ -47,9 +47,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
step 'I click "All" link' do
find(".js-author-search").click
+ expect(page).to have_selector(".dropdown-menu-author li a")
find(".dropdown-menu-author li a", match: :first).click
+ expect(page).not_to have_selector(".dropdown-menu-author li a")
+
find(".js-assignee-search").click
+ expect(page).to have_selector(".dropdown-menu-assignee li a")
find(".dropdown-menu-assignee li a", match: :first).click
+ expect(page).not_to have_selector(".dropdown-menu-assignee li a")
end
def should_see(merge_request)
diff --git a/features/steps/dashboard/new_project.rb b/features/steps/dashboard/new_project.rb
index 727a6a71373..dcfa88f69fc 100644
--- a/features/steps/dashboard/new_project.rb
+++ b/features/steps/dashboard/new_project.rb
@@ -29,6 +29,7 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
end
step 'I am redirected to the GitHub import page' do
+ expect(page).to have_content('Import Projects from GitHub')
expect(current_path).to eq new_import_github_path
end
@@ -47,6 +48,7 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
end
step 'I redirected to Google Code import page' do
+ expect(page).to have_content('Import projects from Google Code')
expect(current_path).to eq new_import_google_code_path
end
end