Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
f0bfeb6e
Commit
f0bfeb6e
authored
Jul 23, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor explore area tests. Replaced old links
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
367445fd
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
23 additions
and
23 deletions
+23
-23
app/views/dashboard/_zero_authorized_projects.html.haml
app/views/dashboard/_zero_authorized_projects.html.haml
+1
-1
app/views/explore/projects/index.html.haml
app/views/explore/projects/index.html.haml
+6
-6
app/views/explore/projects/trending.html.haml
app/views/explore/projects/trending.html.haml
+1
-1
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+1
-1
features/explore/projects.feature
features/explore/projects.feature
+1
-1
features/explore/public_groups.feature
features/explore/public_groups.feature
+1
-1
features/steps/explore/groups_feature.rb
features/steps/explore/groups_feature.rb
+9
-9
features/steps/explore/projects.rb
features/steps/explore/projects.rb
+1
-1
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+2
-2
No files found.
app/views/dashboard/_zero_authorized_projects.html.haml
View file @
f0bfeb6e
...
@@ -46,5 +46,5 @@
...
@@ -46,5 +46,5 @@
%br
%br
Public projects are an easy way to allow everyone to have read-only access.
Public projects are an easy way to allow everyone to have read-only access.
.link_holder
.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 »
Browse public projects »
app/views/explore/projects/index.html.haml
View file @
f0bfeb6e
.clearfix
.clearfix
.pull-left
.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
.form-group
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"Filter by name"
,
class:
"form-control search-text-input input-mn-300"
,
id:
"projects_search"
=
search_field_tag
:search
,
params
[
:search
],
placeholder:
"Filter by name"
,
class:
"form-control search-text-input input-mn-300"
,
id:
"projects_search"
.form-group
.form-group
...
@@ -17,15 +17,15 @@
...
@@ -17,15 +17,15 @@
%b
.caret
%b
.caret
%ul
.dropdown-menu
%ul
.dropdown-menu
%li
%li
=
link_to
public
_projects_path
(
sort:
nil
)
do
=
link_to
explore
_projects_path
(
sort:
nil
)
do
Name
Name
=
link_to
public
_projects_path
(
sort:
'newest'
)
do
=
link_to
explore
_projects_path
(
sort:
'newest'
)
do
Newest
Newest
=
link_to
public
_projects_path
(
sort:
'oldest'
)
do
=
link_to
explore
_projects_path
(
sort:
'oldest'
)
do
Oldest
Oldest
=
link_to
public
_projects_path
(
sort:
'recently_updated'
)
do
=
link_to
explore
_projects_path
(
sort:
'recently_updated'
)
do
Recently updated
Recently updated
=
link_to
public
_projects_path
(
sort:
'last_updated'
)
do
=
link_to
explore
_projects_path
(
sort:
'last_updated'
)
do
Last updated
Last updated
%hr
%hr
...
...
app/views/explore/projects/trending.html.haml
View file @
f0bfeb6e
...
@@ -8,4 +8,4 @@
...
@@ -8,4 +8,4 @@
=
render
@trending_projects
=
render
@trending_projects
.center
.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'
app/views/layouts/_public_head_panel.html.haml
View file @
f0bfeb6e
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.container
.container
%div
.app_logo
%div
.app_logo
%span
.separator
%span
.separator
=
link_to
public
_root_path
,
class:
"home"
do
=
link_to
explore
_root_path
,
class:
"home"
do
%h1
GITLAB
%h1
GITLAB
%span
.separator
%span
.separator
%h1
.title
=
title
%h1
.title
=
title
...
...
features/
public
/projects.feature
→
features/
explore
/projects.feature
View file @
f0bfeb6e
@public
@public
Feature
:
Public
Projects Feature
Feature
:
Explore
Projects Feature
Background
:
Background
:
Given
public project
"Community"
Given
public project
"Community"
And
internal project
"Internal"
And
internal project
"Internal"
...
...
features/
public
/public_groups.feature
→
features/
explore
/public_groups.feature
View file @
f0bfeb6e
@public
@public
Feature
:
Public Project
s Feature
Feature
:
Explore Group
s Feature
Background
:
Background
:
Given
group
"TestGroup"
has private project
"Enterprise"
Given
group
"TestGroup"
has private project
"Enterprise"
...
...
features/steps/
public
/groups_feature.rb
→
features/steps/
explore
/groups_feature.rb
View file @
f0bfeb6e
class
Spinach::Features::
PublicProject
sFeature
<
Spinach
::
FeatureSteps
class
Spinach::Features::
ExploreGroup
sFeature
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedAuthentication
include
SharedPaths
include
SharedPaths
include
SharedGroup
include
SharedGroup
...
@@ -15,7 +15,7 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
...
@@ -15,7 +15,7 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
step
'group "TestGroup" has public project "Community"'
do
step
'group "TestGroup" has public project "Community"'
do
group_has_project
(
"TestGroup"
,
"Community"
,
Gitlab
::
VisibilityLevel
::
PUBLIC
)
group_has_project
(
"TestGroup"
,
"Community"
,
Gitlab
::
VisibilityLevel
::
PUBLIC
)
end
end
step
'"John Doe" is owner of group "TestGroup"'
do
step
'"John Doe" is owner of group "TestGroup"'
do
group
=
Group
.
find_by
(
name:
"TestGroup"
)
||
create
(
:group
,
name:
"TestGroup"
)
group
=
Group
.
find_by
(
name:
"TestGroup"
)
||
create
(
:group
,
name:
"TestGroup"
)
user
=
create
(
:user
,
name:
"John Doe"
)
user
=
create
(
:user
,
name:
"John Doe"
)
...
@@ -37,31 +37,31 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
...
@@ -37,31 +37,31 @@ class Spinach::Features::PublicProjectsFeature < Spinach::FeatureSteps
step
'I visit group "TestGroup" members page'
do
step
'I visit group "TestGroup" members page'
do
visit
members_group_path
(
Group
.
find_by
(
name:
"TestGroup"
))
visit
members_group_path
(
Group
.
find_by
(
name:
"TestGroup"
))
end
end
step
'I should not see project "Enterprise" items'
do
step
'I should not see project "Enterprise" items'
do
page
.
should_not
have_content
"Enterprise"
page
.
should_not
have_content
"Enterprise"
end
end
step
'I should see project "Internal" items'
do
step
'I should see project "Internal" items'
do
page
.
should
have_content
"Internal"
page
.
should
have_content
"Internal"
end
end
step
'I should not see project "Internal" items'
do
step
'I should not see project "Internal" items'
do
page
.
should_not
have_content
"Internal"
page
.
should_not
have_content
"Internal"
end
end
step
'I should see project "Community" items'
do
step
'I should see project "Community" items'
do
page
.
should
have_content
"Community"
page
.
should
have_content
"Community"
end
end
step
'I change filter to Everyone\'s'
do
step
'I change filter to Everyone\'s'
do
click_link
"Everyone's"
click_link
"Everyone's"
end
end
step
'I should see group member "John Doe"'
do
step
'I should see group member "John Doe"'
do
page
.
should
have_content
"John Doe"
page
.
should
have_content
"John Doe"
end
end
step
'I should not see member roles'
do
step
'I should not see member roles'
do
page
.
body
.
should_not
match
(
%r{owner|developer|reporter|guest}i
)
page
.
body
.
should_not
match
(
%r{owner|developer|reporter|guest}i
)
end
end
...
...
features/steps/
public
/projects.rb
→
features/steps/
explore
/projects.rb
View file @
f0bfeb6e
class
Spinach::Features::
Public
ProjectsFeature
<
Spinach
::
FeatureSteps
class
Spinach::Features::
Explore
ProjectsFeature
<
Spinach
::
FeatureSteps
include
SharedAuthentication
include
SharedAuthentication
include
SharedPaths
include
SharedPaths
include
SharedProject
include
SharedProject
...
...
features/steps/shared/paths.rb
View file @
f0bfeb6e
...
@@ -324,7 +324,7 @@ module SharedPaths
...
@@ -324,7 +324,7 @@ module SharedPaths
# ----------------------------------------
# ----------------------------------------
step
'I visit the public projects area'
do
step
'I visit the public projects area'
do
visit
public_root
_path
visit
explore_projects
_path
end
end
step
'I visit public page for "Community" project'
do
step
'I visit public page for "Community" project'
do
...
@@ -336,7 +336,7 @@ module SharedPaths
...
@@ -336,7 +336,7 @@ module SharedPaths
# ----------------------------------------
# ----------------------------------------
step
'I visit the public groups area'
do
step
'I visit the public groups area'
do
visit
public
_groups_path
visit
explore
_groups_path
end
end
# ----------------------------------------
# ----------------------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment