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
d320090f
Commit
d320090f
authored
Apr 10, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update state request from vue resource to axios
parent
9d220da8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
68 deletions
+35
-68
app/assets/javascripts/pipelines/components/stage.vue
app/assets/javascripts/pipelines/components/stage.vue
+8
-10
spec/javascripts/pipelines/stage_spec.js
spec/javascripts/pipelines/stage_spec.js
+27
-58
No files found.
app/assets/javascripts/pipelines/components/stage.vue
View file @
d320090f
...
...
@@ -13,16 +13,16 @@
* 3. Merge request widget
* 4. Commit widget
*/
import
axios
from
'
../../lib/utils/axios_utils
'
;
import
Flash
from
'
../../flash
'
;
import
i
con
from
'
../../vue_shared/components/icon.vue
'
;
import
l
oadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
I
con
from
'
../../vue_shared/components/icon.vue
'
;
import
L
oadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
components
:
{
l
oadingIcon
,
i
con
,
L
oadingIcon
,
I
con
,
},
directives
:
{
...
...
@@ -88,9 +88,8 @@
},
fetchJobs
()
{
this
.
$http
.
get
(
this
.
stage
.
dropdown_path
)
.
then
(
response
=>
response
.
json
())
.
then
((
data
)
=>
{
axios
.
get
(
this
.
stage
.
dropdown_path
)
.
then
(({
data
})
=>
{
this
.
dropdownContent
=
data
.
html
;
this
.
isLoading
=
false
;
})
...
...
@@ -98,8 +97,7 @@
this
.
closeDropdown
();
this
.
isLoading
=
false
;
const
flash
=
new
Flash
(
'
Something went wrong on our end.
'
);
return
flash
;
Flash
(
'
Something went wrong on our end.
'
);
});
},
...
...
spec/javascripts/pipelines/stage_spec.js
View file @
d320090f
import
_
from
'
underscore
'
;
import
Vue
from
'
vue
'
;
import
MockAdapter
from
'
axios-mock-adapter
'
;
import
axios
from
'
~/lib/utils/axios_utils
'
;
import
stage
from
'
~/pipelines/components/stage.vue
'
;
import
mountComponent
from
'
spec/helpers/vue_mount_component_helper
'
;
describe
(
'
Pipelines stage component
'
,
()
=>
{
let
StageComponent
;
let
component
;
let
mock
;
beforeEach
(()
=>
{
mock
=
new
MockAdapter
(
axios
);
StageComponent
=
Vue
.
extend
(
stage
);
component
=
new
StageComponent
({
propsData
:
{
stage
:
{
status
:
{
group
:
'
success
'
,
icon
:
'
icon_status_success
'
,
title
:
'
success
'
,
},
dropdown_path
:
'
foo
'
,
component
=
mountComponent
(
StageComponent
,
{
stage
:
{
status
:
{
group
:
'
success
'
,
icon
:
'
icon_status_success
'
,
title
:
'
success
'
,
},
updateDropdown
:
false
,
dropdown_path
:
'
path.json
'
,
},
}).
$mount
();
updateDropdown
:
false
,
});
});
afterEach
(()
=>
{
component
.
$destroy
();
mock
.
restore
();
});
it
(
'
should render a dropdown with the status icon
'
,
()
=>
{
...
...
@@ -31,23 +39,11 @@ describe('Pipelines stage component', () => {
});
describe
(
'
with successfull request
'
,
()
=>
{
const
interceptor
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
({
html
:
'
foo
'
}),
{
status
:
200
,
}));
};
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
interceptor
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
interceptor
,
);
mock
.
onGet
(
'
path.json
'
).
reply
(
200
,
{
html
:
'
foo
'
});
});
it
(
'
should render the received data
'
,
(
done
)
=>
{
it
(
'
should render the received data
'
,
done
=>
{
component
.
$el
.
querySelector
(
'
button
'
).
click
();
setTimeout
(()
=>
{
...
...
@@ -60,20 +56,8 @@ describe('Pipelines stage component', () => {
});
describe
(
'
when request fails
'
,
()
=>
{
const
interceptor
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
({}),
{
status
:
500
,
}));
};
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
interceptor
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
interceptor
,
);
mock
.
onGet
(
'
path.json
'
).
reply
(
500
);
});
it
(
'
should close the dropdown
'
,
()
=>
{
...
...
@@ -86,33 +70,18 @@ describe('Pipelines stage component', () => {
});
describe
(
'
update endpoint correctly
'
,
()
=>
{
const
updatedInterceptor
=
(
request
,
next
)
=>
{
if
(
request
.
url
===
'
bar
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
({
html
:
'
this is the updated content
'
}),
{
status
:
200
,
}));
}
next
();
};
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
updatedInterceptor
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
updatedInterceptor
,
);
mock
.
onGet
(
'
bar.json
'
).
reply
(
200
,
{
html
:
'
this is the updated content
'
});
});
it
(
'
should update the stage to request the new endpoint provided
'
,
(
done
)
=>
{
it
(
'
should update the stage to request the new endpoint provided
'
,
done
=>
{
component
.
stage
=
{
status
:
{
group
:
'
running
'
,
icon
:
'
running
'
,
title
:
'
running
'
,
},
dropdown_path
:
'
bar
'
,
dropdown_path
:
'
bar
.json
'
,
};
Vue
.
nextTick
(()
=>
{
...
...
@@ -121,7 +90,7 @@ describe('Pipelines stage component', () => {
setTimeout
(()
=>
{
expect
(
component
.
$el
.
querySelector
(
'
.js-builds-dropdown-container ul
'
).
textContent
.
trim
(),
).
toEqual
(
'
this is the updated content
'
);
).
toEqual
(
'
this is the updated content
'
);
done
();
});
});
...
...
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