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
Tatuya Kamada
gitlab-ce
Commits
3c383f9f
Commit
3c383f9f
authored
Oct 26, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes filter
parent
a2dbdb88
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
10 deletions
+22
-10
app/assets/javascripts/environments/environments_bundle.js.es6
...ssets/javascripts/environments/environments_bundle.js.es6
+0
-8
spec/javascripts/environments/environments_store_spec.js.es6
spec/javascripts/environments/environments_store_spec.js.es6
+3
-1
spec/javascripts/environments/mock_data.js.es6
spec/javascripts/environments/mock_data.js.es6
+19
-1
No files found.
app/assets/javascripts/environments/environments_bundle.js.es6
View file @
3c383f9f
...
@@ -51,14 +51,6 @@ $(() => {
...
@@ -51,14 +51,6 @@ $(() => {
computed: {
computed: {
filteredEnvironments () {
filteredEnvironments () {
return recursiveMap(filterState(this.visibility), this.state.environments);
return recursiveMap(filterState(this.visibility), this.state.environments);
},
countStopped () {
},
countAvailable () {
// return recursiveMap(filterState('available'), this.state.environments).length;
}
}
},
},
...
...
spec/javascripts/environments/environments_store_spec.js.es6
View file @
3c383f9f
//= require vue
//= require vue
//= require vue-resource
//= require vue-resource
//= require lib/utils/url_utility
//= require lib/utils/url_utility
//= require environments/services/environments_service
//= require environments/stores/environments_store
//= require ./mock_data
//= require ./mock_data
//
//
...
@@ -14,6 +16,6 @@
...
@@ -14,6 +16,6 @@
it('starts with a blank state', () => {
it('starts with a blank state', () => {
expect(gl.environmentsList.EnvironmentsStore.state.environments.length).toBe(0);
expect(gl.environmentsList.EnvironmentsStore.state.environments.length).toBe(0);
});
});
});
});
})();
})();
spec/javascripts/environments/mock_data.js.es6
View file @
3c383f9f
...
@@ -73,5 +73,23 @@ const environmentsList = [
...
@@ -73,5 +73,23 @@ const environmentsList = [
"name": "root"
"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
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