diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2016-11-07 21:53:20 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-16 11:58:08 +0000 |
commit | c3db10d3fb32babb608bb191596e3462454ac41f (patch) | |
tree | 8f41a803e021621dc231a0f574df2204555ff29c | |
parent | a8508608eaf8440da7e55686c649f7209621494c (diff) | |
download | gitlab-ce-c3db10d3fb32babb608bb191596e3462454ac41f.tar.gz |
Removes loading assertions
3 files changed, 1 insertions, 20 deletions
diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6 index 436ac365788..633a71ea9a1 100644 --- a/app/assets/javascripts/environments/components/environment_item.js.es6 +++ b/app/assets/javascripts/environments/components/environment_item.js.es6 @@ -86,7 +86,7 @@ * Verifies is the given environment has manual actions. * Used to verify if we should render them or nor. * - * @returns {Boolean} description + * @returns {Boolean} */ hasManualActions() { return this.$options.hasKey(this.model, 'manual_actions') && this.model.manual_actions.length; diff --git a/app/assets/javascripts/environments/environments_bundle.js.es6 b/app/assets/javascripts/environments/environments_bundle.js.es6 index 1299f64182c..645274a8666 100644 --- a/app/assets/javascripts/environments/environments_bundle.js.es6 +++ b/app/assets/javascripts/environments/environments_bundle.js.es6 @@ -31,7 +31,6 @@ $(() => { return fn(item); }).filter(Boolean); - gl.EnvironmentsListApp = new Vue({ el: '#environments-list-view', diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb index 62fc56f2f46..edabb97e761 100644 --- a/spec/features/environments_spec.rb +++ b/spec/features/environments_spec.rb @@ -12,32 +12,14 @@ feature 'Environments', feature: true, js:true do login_as(user) project.team << [user, role] end - - describe 'Loading environments' do - given!(:environment) { } - given!(:deployment) { } - given!(:manual) { } - - context 'loading environments' do - before do - visit namespace_project_environments_path(project.namespace, project) - end - - scenario 'does show loading spinner' do - expect(page).to have_selector('.environments-list-loading') - end - end - end describe 'when showing environments' do - before do visit namespace_project_environments_path(project.namespace, project) wait_for_vue_resource end context 'without environments' do - scenario 'does show "Available" and "Stopped" tab with links' do expect(page).to have_link('Available') expect(page).to have_link('Stopped') |