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
Jérome Perrin
gitlab-ce
Commits
3d4c40a0
Commit
3d4c40a0
authored
Feb 07, 2018
by
Clement Ho
Committed by
Fatih Acet
Feb 07, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace $.ajax in profile.js with axios
parent
071b0ef3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
17 deletions
+25
-17
app/assets/javascripts/profile/profile.js
app/assets/javascripts/profile/profile.js
+16
-17
spec/features/profiles/user_visits_profile_spec.rb
spec/features/profiles/user_visits_profile_spec.rb
+9
-0
No files found.
app/assets/javascripts/profile/profile.js
View file @
3d4c40a0
/* eslint-disable comma-dangle, no-unused-vars, class-methods-use-this, quotes, consistent-return, func-names, prefer-arrow-callback, space-before-function-paren, max-len */
/* eslint-disable comma-dangle, no-unused-vars, class-methods-use-this, quotes, consistent-return, func-names, prefer-arrow-callback, space-before-function-paren, max-len */
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
Flash
from
'
../flash
'
;
import
{
getPagePath
}
from
'
~/lib/utils/common_utils
'
;
import
{
getPagePath
}
from
'
../lib/utils/common_utils
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
{
__
}
from
'
~/locale
'
;
import
flash
from
'
../flash
'
;
((
global
)
=>
{
((
global
)
=>
{
class
Profile
{
class
Profile
{
...
@@ -57,8 +59,8 @@ import { getPagePath } from '../lib/utils/common_utils';
...
@@ -57,8 +59,8 @@ import { getPagePath } from '../lib/utils/common_utils';
onUpdateNotifs
(
e
,
data
)
{
onUpdateNotifs
(
e
,
data
)
{
return
data
.
saved
?
return
data
.
saved
?
new
Flash
(
"
Notification settings saved
"
,
"
notice
"
)
:
flash
(
__
(
'
Notification settings saved
'
),
'
notice
'
)
:
new
Flash
(
"
Failed to save new settings
"
,
"
alert
"
);
flash
(
__
(
'
Failed to save new settings
'
)
);
}
}
saveForm
()
{
saveForm
()
{
...
@@ -70,21 +72,18 @@ import { getPagePath } from '../lib/utils/common_utils';
...
@@ -70,21 +72,18 @@ import { getPagePath } from '../lib/utils/common_utils';
formData
.
append
(
'
user[avatar]
'
,
avatarBlob
,
'
avatar.png
'
);
formData
.
append
(
'
user[avatar]
'
,
avatarBlob
,
'
avatar.png
'
);
}
}
return
$
.
ajax
({
axios
({
method
:
this
.
form
.
attr
(
'
method
'
),
url
:
this
.
form
.
attr
(
'
action
'
),
url
:
this
.
form
.
attr
(
'
action
'
),
type
:
this
.
form
.
attr
(
'
method
'
),
data
:
formData
,
data
:
formData
,
dataType
:
"
json
"
,
})
processData
:
false
,
.
then
(({
data
})
=>
flash
(
data
.
message
,
'
notice
'
))
contentType
:
false
,
.
then
(()
=>
{
success
:
response
=>
new
Flash
(
response
.
message
,
'
notice
'
),
error
:
jqXHR
=>
new
Flash
(
jqXHR
.
responseJSON
.
message
,
'
alert
'
),
complete
:
()
=>
{
window
.
scrollTo
(
0
,
0
);
window
.
scrollTo
(
0
,
0
);
// Enable submit button after requests ends
// Enable submit button after requests ends
return
self
.
form
.
find
(
'
:input[disabled]
'
).
enable
();
self
.
form
.
find
(
'
:input[disabled]
'
).
enable
();
}
})
}
);
.
catch
(
error
=>
flash
(
error
.
message
)
);
}
}
setNewRepoCookie
()
{
setNewRepoCookie
()
{
...
...
spec/features/profiles/user_visits_profile_spec.rb
View file @
3d4c40a0
...
@@ -12,4 +12,13 @@ describe 'User visits their profile' do
...
@@ -12,4 +12,13 @@ describe 'User visits their profile' do
it
'shows correct menu item'
do
it
'shows correct menu item'
do
expect
(
page
).
to
have_active_navigation
(
'Profile'
)
expect
(
page
).
to
have_active_navigation
(
'Profile'
)
end
end
describe
'profile settings'
,
:js
do
it
'saves updates'
do
fill_in
'user_bio'
,
with:
'bio'
click_button
'Update profile settings'
expect
(
page
).
to
have_content
(
'Profile was successfully updated'
)
end
end
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