Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-10-04 17:03:13 +0300
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-10-14 12:07:00 +0300
commit6a4f71008390752e6b5574a9e9bdf277732d852d (patch)
treecedc380844ee38ec20b89916a6038d3c4aeaa1c1 /spec/javascripts
parente4c74ffe3ed93815b131445796e63e2127eb8c3e (diff)
Show what time ago a MR was deployed
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/merge_request_widget_spec.js27
1 files changed, 22 insertions, 5 deletions
diff --git a/spec/javascripts/merge_request_widget_spec.js b/spec/javascripts/merge_request_widget_spec.js
index 17b32914ec3..75ef10939de 100644
--- a/spec/javascripts/merge_request_widget_spec.js
+++ b/spec/javascripts/merge_request_widget_spec.js
@@ -1,5 +1,5 @@
-
/*= require merge_request_widget */
+/*= require lib/utils/jquery.timeago.js */
(function() {
describe('MergeRequestWidget', function() {
@@ -20,7 +20,7 @@
gitlab_icon: "gitlab_logo.png",
builds_path: "http://sampledomain.local/sampleBuildsPath"
};
- this["class"] = new MergeRequestWidget(this.opts);
+ this["class"] = new window.gl.MergeRequestWidget(this.opts);
return this.ciStatusData = {
"title": "Sample MR title",
"sha": "12a34bc5",
@@ -30,7 +30,7 @@
});
return describe('getCIStatus', function() {
beforeEach(function() {
- return spyOn(jQuery, 'getJSON').and.callFake((function(_this) {
+ spyOn(jQuery, 'getJSON').and.callFake((function(_this) {
return function(req, cb) {
return cb(_this.ciStatusData);
};
@@ -61,13 +61,30 @@
this["class"].getCIStatus(false);
return expect(spy).not.toHaveBeenCalled();
});
- return it('should not display a notification on the first check after the widget has been created', function() {
+ it('should not display a notification on the first check after the widget has been created', function() {
var spy;
spy = spyOn(window, 'notify');
- this["class"] = new MergeRequestWidget(this.opts);
+ this["class"] = new window.gl.MergeRequestWidget(this.opts);
this["class"].getCIStatus(true);
return expect(spy).not.toHaveBeenCalled();
});
+ it('should call renderEnvironments when the environments property is set', function() {
+ this.ciStatusData.environments = [{
+ created_at: '2016-09-12T13:38:30.636Z',
+ environment_id: 1,
+ environment_name: 'env1',
+ external_url: 'https://test-url.com',
+ external_url_formatted: 'test-url.com'
+ }];
+ var spy = spyOn(this['class'], 'renderEnvironments').and.stub();
+ this['class'].getCIStatus(false);
+ expect(spy).toHaveBeenCalledWith(this.ciStatusData.environments);
+ });
+ it('should not call renderEnvironments when the environments property is not set', function() {
+ var spy = spyOn(this['class'], 'renderEnvironments').and.stub();
+ this['class'].getCIStatus(false);
+ expect(spy).not.toHaveBeenCalled();
+ });
});
});