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
Léo-Paul Géneau
gitlab-ce
Commits
e89fad52
Commit
e89fad52
authored
Nov 28, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken specs
Don't add disabled class to loading button
parent
9e0ce26c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
app/assets/javascripts/clusters/clusters_index.js
app/assets/javascripts/clusters/clusters_index.js
+0
-1
spec/features/projects/features_visibility_spec.rb
spec/features/projects/features_visibility_spec.rb
+3
-3
spec/javascripts/clusters/clusters_index_spec.js
spec/javascripts/clusters/clusters_index_spec.js
+1
-1
No files found.
app/assets/javascripts/clusters/clusters_index.js
View file @
e89fad52
...
@@ -13,7 +13,6 @@ const toggleLoadingButton = (button) => {
...
@@ -13,7 +13,6 @@ const toggleLoadingButton = (button) => {
button
.
setAttribute
(
'
disabled
'
,
true
);
button
.
setAttribute
(
'
disabled
'
,
true
);
}
}
button
.
classList
.
toggle
(
'
is-disabled
'
);
button
.
classList
.
toggle
(
'
is-loading
'
);
button
.
classList
.
toggle
(
'
is-loading
'
);
};
};
...
...
spec/features/projects/features_visibility_spec.rb
View file @
e89fad52
...
@@ -177,7 +177,7 @@ describe 'Edit Project Settings' do
...
@@ -177,7 +177,7 @@ describe 'Edit Project Settings' do
click_button
"Save changes"
click_button
"Save changes"
end
end
expect
(
find
(
".sharing-permissions"
)).
to
have_selector
(
".project-feature-toggle.disabled"
,
count:
2
)
expect
(
find
(
".sharing-permissions"
)).
to
have_selector
(
".project-feature-toggle.
is-
disabled"
,
count:
2
)
end
end
it
"shows empty features project homepage"
do
it
"shows empty features project homepage"
do
...
@@ -272,10 +272,10 @@ describe 'Edit Project Settings' do
...
@@ -272,10 +272,10 @@ describe 'Edit Project Settings' do
end
end
def
toggle_feature_off
(
feature_name
)
def
toggle_feature_off
(
feature_name
)
find
(
".project-feature-controls[data-for=
\"
#{
feature_name
}
\"
] .project-feature-toggle.checked"
).
click
find
(
".project-feature-controls[data-for=
\"
#{
feature_name
}
\"
] .project-feature-toggle.
is-
checked"
).
click
end
end
def
toggle_feature_on
(
feature_name
)
def
toggle_feature_on
(
feature_name
)
find
(
".project-feature-controls[data-for=
\"
#{
feature_name
}
\"
] .project-feature-toggle:not(.checked)"
).
click
find
(
".project-feature-controls[data-for=
\"
#{
feature_name
}
\"
] .project-feature-toggle:not(.
is-
checked)"
).
click
end
end
end
end
spec/javascripts/clusters/clusters_index_spec.js
View file @
e89fad52
...
@@ -20,7 +20,7 @@ describe('Clusters table', () => {
...
@@ -20,7 +20,7 @@ describe('Clusters table', () => {
button
.
click
();
button
.
click
();
expect
(
button
.
classList
).
toContain
(
'
is-loading
'
);
expect
(
button
.
classList
).
toContain
(
'
is-loading
'
);
expect
(
button
.
classList
).
toContain
(
'
is-disabled
'
);
expect
(
button
.
getAttribute
(
'
disabled
'
)).
toEqual
(
'
true
'
);
});
});
afterEach
(()
=>
{
afterEach
(()
=>
{
...
...
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