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
b78705f4
Commit
b78705f4
authored
Dec 05, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move mock performance data into frontend specs
parent
749527e2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
210 additions
and
67 deletions
+210
-67
ee/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
...ts/vue_merge_request_widget/services/mr_widget_service.js
+0
-59
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
...cripts/vue_merge_request_widget/stores/mr_widget_store.js
+0
-7
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
+159
-1
spec/javascripts/vue_mr_widget/mock_data.js
spec/javascripts/vue_mr_widget/mock_data.js
+51
-0
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js
View file @
b78705f4
...
@@ -36,65 +36,6 @@ export default class MRWidgetService extends CEWidgetService {
...
@@ -36,65 +36,6 @@ export default class MRWidgetService extends CEWidgetService {
}
}
fetchReport
(
endpoint
)
{
// eslint-disable-line
fetchReport
(
endpoint
)
{
// eslint-disable-line
if
(
endpoint
===
'
/performance_head
'
)
{
return
new
Promise
((
resolve
)
=>
{
setTimeout
(
resolve
,
1000
,
[
{
subject
:
'
/some/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
85
,
},
],
},
{
subject
:
'
/some/other/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
79
,
},
],
},
{
subject
:
'
/yet/another/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
80
,
},
],
},
]);
});
}
if
(
endpoint
===
'
/performance_base
'
)
{
return
new
Promise
((
resolve
)
=>
{
setTimeout
(
resolve
,
1000
,
[
{
subject
:
'
/some/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
84
,
},
],
},
{
subject
:
'
/some/other/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
80
,
},
],
},
]);
});
}
return
Vue
.
http
.
get
(
endpoint
).
then
(
res
=>
res
.
json
());
return
Vue
.
http
.
get
(
endpoint
).
then
(
res
=>
res
.
json
());
}
}
}
}
ee/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
View file @
b78705f4
...
@@ -60,13 +60,6 @@ export default class MergeRequestStore extends CEMergeRequestStore {
...
@@ -60,13 +60,6 @@ export default class MergeRequestStore extends CEMergeRequestStore {
initPerformanceReport
(
data
)
{
initPerformanceReport
(
data
)
{
this
.
performance
=
data
.
performance
;
this
.
performance
=
data
.
performance
;
// use mock data (see mr_widget_service.js)
this
.
performance
=
{
head_path
:
'
/performance_head
'
,
base_path
:
'
/performance_base
'
,
};
this
.
performanceMetrics
=
{
this
.
performanceMetrics
=
{
improved
:
[],
improved
:
[],
degraded
:
[],
degraded
:
[],
...
...
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
View file @
b78705f4
...
@@ -2,7 +2,13 @@ import Vue from 'vue';
...
@@ -2,7 +2,13 @@ import Vue from 'vue';
import
mrWidgetOptions
from
'
ee/vue_merge_request_widget/mr_widget_options
'
;
import
mrWidgetOptions
from
'
ee/vue_merge_request_widget/mr_widget_options
'
;
import
MRWidgetService
from
'
ee/vue_merge_request_widget/services/mr_widget_service
'
;
import
MRWidgetService
from
'
ee/vue_merge_request_widget/services/mr_widget_service
'
;
import
MRWidgetStore
from
'
ee/vue_merge_request_widget/stores/mr_widget_store
'
;
import
MRWidgetStore
from
'
ee/vue_merge_request_widget/stores/mr_widget_store
'
;
import
mockData
,
{
baseIssues
,
headIssues
,
securityIssues
}
from
'
./mock_data
'
;
import
mockData
,
{
baseIssues
,
headIssues
,
basePerformance
,
headPerformance
,
securityIssues
,
}
from
'
./mock_data
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
import
mountComponent
from
'
../helpers/vue_mount_component_helper
'
;
describe
(
'
ee merge request widget options
'
,
()
=>
{
describe
(
'
ee merge request widget options
'
,
()
=>
{
...
@@ -278,6 +284,158 @@ describe('ee merge request widget options', () => {
...
@@ -278,6 +284,158 @@ describe('ee merge request widget options', () => {
});
});
});
});
describe
(
'
performance
'
,
()
=>
{
beforeEach
(()
=>
{
gl
.
mrWidgetData
=
{
...
mockData
,
performance
:
{
head_path
:
'
head.json
'
,
base_path
:
'
base.json
'
,
},
};
Component
.
mr
=
new
MRWidgetStore
(
gl
.
mrWidgetData
);
Component
.
service
=
new
MRWidgetService
({});
});
describe
(
'
when it is loading
'
,
()
=>
{
it
(
'
should render loading indicator
'
,
()
=>
{
vm
=
mountComponent
(
Component
);
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget
'
).
textContent
.
trim
(),
).
toContain
(
'
Loading performance report
'
);
});
});
describe
(
'
with successful request
'
,
()
=>
{
const
interceptor
=
(
request
,
next
)
=>
{
if
(
request
.
url
===
'
head.json
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
(
headPerformance
),
{
status
:
200
,
}));
}
if
(
request
.
url
===
'
base.json
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
(
basePerformance
),
{
status
:
200
,
}));
}
};
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
interceptor
);
vm
=
mountComponent
(
Component
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
interceptor
);
});
it
(
'
should render provided data
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-code-text
'
).
textContent
.
trim
(),
).
toEqual
(
'
Performance metrics improved on 1 point and degraded on 1 point
'
);
done
();
},
0
);
});
describe
(
'
text connector
'
,
()
=>
{
it
(
'
should only render information about fixed issues
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
vm
.
mr
.
performanceMetrics
.
degraded
=
[];
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-code-text
'
).
textContent
.
trim
(),
).
toEqual
(
'
Performance metrics improved on 1 point
'
);
done
();
});
},
0
);
});
it
(
'
should only render information about added issues
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
vm
.
mr
.
performanceMetrics
.
improved
=
[];
Vue
.
nextTick
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-code-text
'
).
textContent
.
trim
(),
).
toEqual
(
'
Performance metrics degraded on 1 point
'
);
done
();
});
},
0
);
});
});
});
describe
(
'
with empty successful request
'
,
()
=>
{
const
emptyInterceptor
=
(
request
,
next
)
=>
{
if
(
request
.
url
===
'
head.json
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
([]),
{
status
:
200
,
}));
}
if
(
request
.
url
===
'
base.json
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
([]),
{
status
:
200
,
}));
}
};
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
emptyInterceptor
);
vm
=
mountComponent
(
Component
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
emptyInterceptor
);
});
it
(
'
should render provided data
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget .js-code-text
'
).
textContent
.
trim
(),
).
toEqual
(
'
No changes to performance metrics
'
);
done
();
},
0
);
});
});
describe
(
'
with failed request
'
,
()
=>
{
const
errorInterceptor
=
(
request
,
next
)
=>
{
if
(
request
.
url
===
'
head.json
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
([]),
{
status
:
500
,
}));
}
if
(
request
.
url
===
'
base.json
'
)
{
next
(
request
.
respondWith
(
JSON
.
stringify
([]),
{
status
:
500
,
}));
}
};
beforeEach
(()
=>
{
Vue
.
http
.
interceptors
.
push
(
errorInterceptor
);
vm
=
mountComponent
(
Component
);
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
errorInterceptor
);
});
it
(
'
should render error indicator
'
,
(
done
)
=>
{
setTimeout
(()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-performance-widget
'
).
textContent
.
trim
()).
toContain
(
'
Failed to load performance report
'
);
done
();
},
0
);
});
});
});
describe
(
'
computed
'
,
()
=>
{
describe
(
'
computed
'
,
()
=>
{
describe
(
'
shouldRenderApprovals
'
,
()
=>
{
describe
(
'
shouldRenderApprovals
'
,
()
=>
{
it
(
'
should return false when no approvals
'
,
()
=>
{
it
(
'
should return false when no approvals
'
,
()
=>
{
...
...
spec/javascripts/vue_mr_widget/mock_data.js
View file @
b78705f4
...
@@ -308,6 +308,57 @@ export const parsedBaseIssues = [
...
@@ -308,6 +308,57 @@ export const parsedBaseIssues = [
},
},
];
];
export
const
headPerformance
=
[
{
subject
:
'
/some/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
85
,
},
],
},
{
subject
:
'
/some/other/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
79
,
},
],
},
{
subject
:
'
/yet/another/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
80
,
},
],
},
];
export
const
basePerformance
=
[
{
subject
:
'
/some/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
84
,
},
],
},
{
subject
:
'
/some/other/path
'
,
metrics
:
[
{
name
:
'
Sitespeed Score
'
,
value
:
80
,
},
],
},
];
export
const
codequalityParsedIssues
=
[
export
const
codequalityParsedIssues
=
[
{
{
name
:
'
Insecure Dependency
'
,
name
:
'
Insecure Dependency
'
,
...
...
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