Refactor explore area tests. Replaced old links
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
367445fdcd
commit
f0bfeb6e33
9 changed files with 23 additions and 23 deletions
|
@ -46,5 +46,5 @@
|
|||
%br
|
||||
Public projects are an easy way to allow everyone to have read-only access.
|
||||
.link_holder
|
||||
= link_to public_projects_path, class: "btn btn-new" do
|
||||
= link_to explore_projects_path, class: "btn btn-new" do
|
||||
Browse public projects »
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
.clearfix
|
||||
.pull-left
|
||||
= form_tag public_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
|
||||
= form_tag explore_projects_path, method: :get, class: 'form-inline form-tiny' do |f|
|
||||
.form-group
|
||||
= search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input input-mn-300", id: "projects_search"
|
||||
.form-group
|
||||
|
@ -17,15 +17,15 @@
|
|||
%b.caret
|
||||
%ul.dropdown-menu
|
||||
%li
|
||||
= link_to public_projects_path(sort: nil) do
|
||||
= link_to explore_projects_path(sort: nil) do
|
||||
Name
|
||||
= link_to public_projects_path(sort: 'newest') do
|
||||
= link_to explore_projects_path(sort: 'newest') do
|
||||
Newest
|
||||
= link_to public_projects_path(sort: 'oldest') do
|
||||
= link_to explore_projects_path(sort: 'oldest') do
|
||||
Oldest
|
||||
= link_to public_projects_path(sort: 'recently_updated') do
|
||||
= link_to explore_projects_path(sort: 'recently_updated') do
|
||||
Recently updated
|
||||
= link_to public_projects_path(sort: 'last_updated') do
|
||||
= link_to explore_projects_path(sort: 'last_updated') do
|
||||
Last updated
|
||||
|
||||
%hr
|
||||
|
|
|
@ -8,4 +8,4 @@
|
|||
= render @trending_projects
|
||||
|
||||
.center
|
||||
= link_to 'Show all projects', public_projects_path, class: 'btn btn-primary'
|
||||
= link_to 'Show all projects', explore_projects_path, class: 'btn btn-primary'
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
.container
|
||||
%div.app_logo
|
||||
%span.separator
|
||||
= link_to public_root_path, class: "home" do
|
||||
= link_to explore_root_path, class: "home" do
|
||||
%h1 GITLAB
|
||||
%span.separator
|
||||
%h1.title= title
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
@public
|
||||
Feature: Public Projects Feature
|
||||
Feature: Explore Projects Feature
|
||||
Background:
|
||||
Given public project "Community"
|
||||
And internal project "Internal"
|
|
@ -1,5 +1,5 @@
|
|||
@public
|
||||
Feature: Public Projects Feature
|
||||
Feature: Explore Groups Feature
|
||||
Background:
|
||||
Given group "TestGroup" has private project "Enterprise"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
|
||||
class Spinach::Features::ExploreGroupsFeature < Spinach::FeatureSteps
|
||||
include SharedAuthentication
|
||||
include SharedPaths
|
||||
include SharedGroup
|
||||
|
@ -15,7 +15,7 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
|
|||
step 'group "TestGroup" has public project "Community"' do
|
||||
group_has_project("TestGroup", "Community", Gitlab::VisibilityLevel::PUBLIC)
|
||||
end
|
||||
|
||||
|
||||
step '"John Doe" is owner of group "TestGroup"' do
|
||||
group = Group.find_by(name: "TestGroup") || create(:group, name: "TestGroup")
|
||||
user = create(:user, name: "John Doe")
|
||||
|
@ -37,31 +37,31 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
|
|||
step 'I visit group "TestGroup" members page' do
|
||||
visit members_group_path(Group.find_by(name: "TestGroup"))
|
||||
end
|
||||
|
||||
|
||||
step 'I should not see project "Enterprise" items' do
|
||||
page.should_not have_content "Enterprise"
|
||||
end
|
||||
|
||||
|
||||
step 'I should see project "Internal" items' do
|
||||
page.should have_content "Internal"
|
||||
end
|
||||
|
||||
|
||||
step 'I should not see project "Internal" items' do
|
||||
page.should_not have_content "Internal"
|
||||
end
|
||||
|
||||
|
||||
step 'I should see project "Community" items' do
|
||||
page.should have_content "Community"
|
||||
end
|
||||
|
||||
|
||||
step 'I change filter to Everyone\'s' do
|
||||
click_link "Everyone's"
|
||||
end
|
||||
|
||||
|
||||
step 'I should see group member "John Doe"' do
|
||||
page.should have_content "John Doe"
|
||||
end
|
||||
|
||||
|
||||
step 'I should not see member roles' do
|
||||
page.body.should_not match(%r{owner|developer|reporter|guest}i)
|
||||
end
|
|
@ -1,4 +1,4 @@
|
|||
class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
|
||||
class Spinach::Features::ExploreProjectsFeature < Spinach::FeatureSteps
|
||||
include SharedAuthentication
|
||||
include SharedPaths
|
||||
include SharedProject
|
|
@ -324,7 +324,7 @@ module SharedPaths
|
|||
# ----------------------------------------
|
||||
|
||||
step 'I visit the public projects area' do
|
||||
visit public_root_path
|
||||
visit explore_projects_path
|
||||
end
|
||||
|
||||
step 'I visit public page for "Community" project' do
|
||||
|
@ -336,7 +336,7 @@ module SharedPaths
|
|||
# ----------------------------------------
|
||||
|
||||
step 'I visit the public groups area' do
|
||||
visit public_groups_path
|
||||
visit explore_groups_path
|
||||
end
|
||||
|
||||
# ----------------------------------------
|
||||
|
|
Loading…
Reference in a new issue