summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-10-26 09:17:32 +0100
committerFilipa Lacerda <filipa@gitlab.com>2016-11-16 11:58:05 +0000
commit3c383f9f76a8cec6ecf69a012567cb70b8466897 (patch)
treecbdcf0192717247e66fcbf2efb6ce750cf25e5d5
parenta2dbdb88be6fdd363d42f925c2792adb2e4756ab (diff)
downloadgitlab-ce-3c383f9f76a8cec6ecf69a012567cb70b8466897.tar.gz
Fixes filter
-rw-r--r--app/assets/javascripts/environments/environments_bundle.js.es68
-rw-r--r--spec/javascripts/environments/environments_store_spec.js.es64
-rw-r--r--spec/javascripts/environments/mock_data.js.es620
3 files changed, 22 insertions, 10 deletions
diff --git a/app/assets/javascripts/environments/environments_bundle.js.es6 b/app/assets/javascripts/environments/environments_bundle.js.es6
index 59c0dcfe1c2..8e13e7e20a7 100644
--- a/app/assets/javascripts/environments/environments_bundle.js.es6
+++ b/app/assets/javascripts/environments/environments_bundle.js.es6
@@ -51,14 +51,6 @@ $(() => {
computed: {
filteredEnvironments () {
return recursiveMap(filterState(this.visibility), this.state.environments);
- },
-
- countStopped () {
-
- },
-
- countAvailable () {
- // return recursiveMap(filterState('available'), this.state.environments).length;
}
},
diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6
index 19c71305aa6..ccf6ae971c3 100644
--- a/spec/javascripts/environments/environments_store_spec.js.es6
+++ b/spec/javascripts/environments/environments_store_spec.js.es6
@@ -1,6 +1,8 @@
//= require vue
//= require vue-resource
//= require lib/utils/url_utility
+//= require environments/services/environments_service
+//= require environments/stores/environments_store
//= require ./mock_data
//
@@ -14,6 +16,6 @@
it('starts with a blank state', () => {
expect(gl.environmentsList.EnvironmentsStore.state.environments.length).toBe(0);
});
-
+
});
})();
diff --git a/spec/javascripts/environments/mock_data.js.es6 b/spec/javascripts/environments/mock_data.js.es6
index 8d12965332e..87420a32450 100644
--- a/spec/javascripts/environments/mock_data.js.es6
+++ b/spec/javascripts/environments/mock_data.js.es6
@@ -73,5 +73,23 @@ const environmentsList = [
"name": "root"
}
}
+ },
+ {
+ "id": 18,
+ "project_id": 11,
+ "name": "review/test-environment-1",
+ "created_at": "2016-10-19T14:59:59.303Z",
+ "updated_at": "2016-10-19T14:59:59.303Z",
+ "external_url": "http://test-1.com",
+ "environment_type": "review",
+ "state": "stopped",
+ "project": {
+ "id": 11,
+ "name": "review-apps",
+ "namespace": {
+ "id": 1,
+ "name": "root"
+ }
+ }
}
-]; \ No newline at end of file
+];