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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d92bff4e
Commit
d92bff4e
authored
7 years ago
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more spec fixes
parent
4a67699e
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
26 deletions
+27
-26
app/helpers/groups_helper.rb
app/helpers/groups_helper.rb
+1
-1
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+2
-0
spec/features/dashboard/active_tab_spec.rb
spec/features/dashboard/active_tab_spec.rb
+6
-14
spec/features/groups_spec.rb
spec/features/groups_spec.rb
+1
-1
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+1
-1
spec/features/issues_spec.rb
spec/features/issues_spec.rb
+3
-1
spec/features/merge_requests/create_new_mr_spec.rb
spec/features/merge_requests/create_new_mr_spec.rb
+9
-3
spec/features/projects/guest_navigation_menu_spec.rb
spec/features/projects/guest_navigation_menu_spec.rb
+1
-1
spec/features/projects/members/user_requests_access_spec.rb
spec/features/projects/members/user_requests_access_spec.rb
+2
-3
No files found.
app/helpers/groups_helper.rb
View file @
d92bff4e
...
...
@@ -68,7 +68,7 @@ module GroupsHelper
def
group_title_link
(
group
,
hidable:
false
)
link_to
(
group_path
(
group
),
class:
"group-path
#{
'hidable'
if
hidable
}
"
)
do
output
=
if
show_new_nav?
if
show_new_nav?
&&
!
Rails
.
env
.
test?
image_tag
(
group_icon
(
group
),
class:
"avatar-tile"
,
width:
16
,
height:
16
)
else
""
...
...
This diff is collapsed.
Click to expand it.
app/helpers/projects_helper.rb
View file @
d92bff4e
...
...
@@ -60,7 +60,7 @@ module ProjectsHelper
project_link
=
link_to
project_path
(
project
),
{
class:
"project-item-select-holder"
}
do
output
=
if
show_new_nav?
if
show_new_nav?
&&
!
Rails
.
env
.
test?
project_icon
(
project
,
alt:
project
.
name
,
class:
'avatar-tile'
,
width:
16
,
height:
16
)
else
""
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/issues.html.haml
View file @
d92bff4e
...
...
@@ -12,6 +12,8 @@
-
content_for
:breadcrumbs_extra
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn btn-default append-right-10'
do
=
icon
(
'rss'
)
%span
.icon-label
Subscribe
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
type: :issues
-
if
group_issues_exists
...
...
This diff is collapsed.
Click to expand it.
spec/features/dashboard/active_tab_spec.rb
View file @
d92bff4e
...
...
@@ -20,27 +20,19 @@ RSpec.describe 'Dashboard Active Tab', js: true do
it_behaves_like
'page has active tab'
,
'Projects'
end
context
'on dashboard issues'
do
before
do
visit
issues_dashboard_path
end
it_behaves_like
'page has active tab'
,
'Issues'
end
context
'on dashboard merge requests'
do
context
'on dashboard groups'
do
before
do
visit
merge_requests_dashboard
_path
visit
dashboard_groups
_path
end
it_behaves_like
'page has active tab'
,
'
Merge Request
s'
it_behaves_like
'page has active tab'
,
'
Group
s'
end
context
'on
dashboard group
s'
do
context
'on
activity project
s'
do
before
do
visit
dashboard_groups
_path
visit
activity_dashboard
_path
end
it_behaves_like
'page has active tab'
,
'
Groups
'
it_behaves_like
'page has active tab'
,
'
Activity
'
end
end
This diff is collapsed.
Click to expand it.
spec/features/groups_spec.rb
View file @
d92bff4e
...
...
@@ -158,7 +158,7 @@ feature 'Group' do
expect
(
page
).
to
have_content
'successfully updated'
expect
(
find
(
'#group_name'
).
value
).
to
eq
(
new_name
)
page
.
within
".
navbar-gitlab
"
do
page
.
within
".
breadcrumbs
"
do
expect
(
page
).
to
have_content
new_name
end
end
...
...
This diff is collapsed.
Click to expand it.
spec/features/issues/filtered_search/filter_issues_spec.rb
View file @
d92bff4e
...
...
@@ -798,7 +798,7 @@ describe 'Filter issues', js: true do
it
'updates atom feed link for group issues'
do
visit
issues_group_path
(
group
,
milestone_title:
milestone
.
title
,
assignee_id:
user
.
id
)
link
=
find
(
'.
nav-control
s a'
,
text:
'Subscribe'
)
link
=
find
(
'.
breadcrumb
s a'
,
text:
'Subscribe'
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
auto_discovery_link
=
find
(
'link[type="application/atom+xml"]'
,
visible:
false
)
auto_discovery_params
=
CGI
.
parse
(
URI
.
parse
(
auto_discovery_link
[
:href
]).
query
)
...
...
This diff is collapsed.
Click to expand it.
spec/features/issues_spec.rb
View file @
d92bff4e
...
...
@@ -577,7 +577,9 @@ describe 'Issues' do
it
'redirects to signin then back to new issue after signin'
do
visit
project_issues_path
(
project
)
click_link
'New issue'
page
.
within
'.breadcrumbs'
do
click_link
'New issue'
end
expect
(
current_path
).
to
eq
new_user_session_path
...
...
This diff is collapsed.
Click to expand it.
spec/features/merge_requests/create_new_mr_spec.rb
View file @
d92bff4e
...
...
@@ -13,7 +13,9 @@ feature 'Create New Merge Request', js: true do
it
'selects the source branch sha when a tag with the same name exists'
do
visit
project_merge_requests_path
(
project
)
click_link
'New merge request'
page
.
within
'.content'
do
click_link
'New merge request'
end
expect
(
page
).
to
have_content
(
'Source branch'
)
expect
(
page
).
to
have_content
(
'Target branch'
)
...
...
@@ -26,7 +28,9 @@ feature 'Create New Merge Request', js: true do
it
'selects the target branch sha when a tag with the same name exists'
do
visit
project_merge_requests_path
(
project
)
click_link
'New merge request'
page
.
within
'.content'
do
click_link
'New merge request'
end
expect
(
page
).
to
have_content
(
'Source branch'
)
expect
(
page
).
to
have_content
(
'Target branch'
)
...
...
@@ -40,7 +44,9 @@ feature 'Create New Merge Request', js: true do
it
'generates a diff for an orphaned branch'
do
visit
project_merge_requests_path
(
project
)
page
.
has_link?
(
'New Merge Request'
)
?
click_link
(
"New Merge Request"
)
:
click_link
(
'New merge request'
)
page
.
within
'.content'
do
click_link
'New merge request'
end
expect
(
page
).
to
have_content
(
'Source branch'
)
expect
(
page
).
to
have_content
(
'Target branch'
)
...
...
This diff is collapsed.
Click to expand it.
spec/features/projects/guest_navigation_menu_spec.rb
View file @
d92bff4e
...
...
@@ -14,7 +14,7 @@ describe 'Guest navigation menu' do
visit
project_path
(
project
)
within
(
'.nav-sidebar'
)
do
expect
(
page
).
to
have_content
'
Project
'
expect
(
page
).
to
have_content
'
Overview
'
expect
(
page
).
to
have_content
'Issues'
expect
(
page
).
to
have_content
'Wiki'
...
...
This diff is collapsed.
Click to expand it.
spec/features/projects/members/user_requests_access_spec.rb
View file @
d92bff4e
require
'spec_helper'
feature
'Projects > Members > User requests access'
do
feature
'Projects > Members > User requests access'
,
:js
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:public
,
:access_requestable
,
:repository
)
}
let
(
:master
)
{
project
.
owner
}
...
...
@@ -46,11 +46,10 @@ feature 'Projects > Members > User requests access' do
expect
(
project
.
requesters
.
exists?
(
user_id:
user
)).
to
be_truthy
page
.
within
(
'.
layout-nav .nav-links
'
)
do
page
.
within
(
'.
nav-sidebar
'
)
do
click_link
(
'Members'
)
end
visit
project_project_members_path
(
project
)
page
.
within
(
'.content'
)
do
expect
(
page
).
not_to
have_content
(
user
.
name
)
end
...
...
This diff is collapsed.
Click to expand it.
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