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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
465f95a8
Commit
465f95a8
authored
Oct 24, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken rspec tests
parent
873d60d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/groups_select.js
app/assets/javascripts/groups_select.js
+4
-4
spec/features/projects/members/share_with_group_spec.rb
spec/features/projects/members/share_with_group_spec.rb
+1
-1
No files found.
app/assets/javascripts/groups_select.js
View file @
465f95a8
...
...
@@ -2,7 +2,8 @@ import Api from './api';
import
{
normalizeCRLFHeaders
}
from
'
./lib/utils/common_utils
'
;
export
default
function
groupsSelect
()
{
const
PER_PAGE
=
20
;
// Needs to be accessible in rspec
window
.
GROUP_SELECT_PER_PAGE
=
20
;
$
(
'
.ajax-groups-select
'
).
each
(
function
setAjaxGroupsSelect2
()
{
const
$select
=
$
(
this
);
const
allAvailable
=
$select
.
data
(
'
all-available
'
);
...
...
@@ -16,8 +17,7 @@ export default function groupsSelect() {
dataType
:
'
json
'
,
quietMillis
:
250
,
transport
(
params
)
{
// eslint-disable-next-line promise/catch-or-return
$
.
ajax
(
params
)
return
$
.
ajax
(
params
)
.
then
((
data
,
status
,
xhr
)
=>
{
const
results
=
data
||
[];
...
...
@@ -40,7 +40,7 @@ export default function groupsSelect() {
return
{
search
,
page
,
per_page
:
PER_PAGE
,
per_page
:
window
.
GROUP_SELECT_
PER_PAGE
,
all_available
:
allAvailable
,
};
},
...
...
spec/features/projects/members/share_with_group_spec.rb
View file @
465f95a8
...
...
@@ -149,7 +149,7 @@ feature 'Project > Members > Share with Group', :js do
create
(
:group
).
add_owner
(
master
)
visit
project_settings_members_path
(
project
)
execute_script
'G
roupsSelect.
PER_PAGE = 1;'
execute_script
'G
ROUP_SELECT_
PER_PAGE = 1;'
open_select2
'#link_group_id'
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