Skip to content

G
gitlab-ce
Commit 1906a32b authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Fix SCSS lint errors 

Fixes some tests
parent cd476336
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 255 deletions
app/assets/javascripts/environments/environments_bundle.js.es6
View file @ 1906a32b
...@@ -73,9 +73,6 @@ $(() => { ...@@ -73,9 +73,6 @@ $(() => {
ready() { ready() {
gl.environmentsService.all().then((resp) => { gl.environmentsService.all().then((resp) => {
Store.storeEnvironments(resp.json()); Store.storeEnvironments(resp.json());
console.log("HELLLLOOOOOOOOOOOOOO", resp.json())
this.loading = false; this.loading = false;
}); });
}, },
......
app/assets/javascripts/environments/stores/environmnets_store.js.es6
View file @ 1906a32b
...@@ -43,17 +43,16 @@ ...@@ -43,17 +43,16 @@
*/ */
storeEnvironments(environments = []) { storeEnvironments(environments = []) {
const environmentsTree = environments.reduce((acc, environment) => { const environmentsTree = environments.reduce((acc, environment) => {
const data = Object.assign({}, environment);
if (environment.last_deployment) {
if (data.last_deployment) {
//humanizes actions names if there are any actions //humanizes actions names if there are any actions
if (data.last_deployment.manual_actions) { if (environment.last_deployment.manual_actions) {
data.last_deployment.manual_actions = data.last_deployment.manual_actions.map((action) => Object.assign({}, action, {name: gl.text.humanize(action.name)})); environment.last_deployment.manual_actions = environment.last_deployment.manual_actions.map((action) => Object.assign({}, action, {name: gl.text.humanize(action.name)}));
} }
//transforms created date for deployment in a human readable format //transforms created date for deployment in a human readable format
if (data.last_deployment.created_at) { if (environment.last_deployment.created_at) {
// TODO - how to do this without jquery // TODO - how to do this without jquery
} }
} }
...@@ -64,21 +63,21 @@ ...@@ -64,21 +63,21 @@
}); });
data["vue-isChildren"] = true; environment["vue-isChildren"] = true;
if (occurs !== undefined) { if (occurs !== undefined) {
acc[acc.indexOf(occurs)].children.push(data); acc[acc.indexOf(occurs)].children.push(environment);
acc[acc.indexOf(occurs)].children.push(data).sort(this.sortByName) acc[acc.indexOf(occurs)].children.push(environment).sort(this.sortByName)
} else { } else {
acc.push({ acc.push({
name: environment.environment_type, name: environment.environment_type,
children: [ children: [
Object.assign(data) Object.assign(environment)
] ]
}); });
} }
} else { } else {
acc.push(data); acc.push(environment);
} }
return acc; return acc;
......
app/assets/stylesheets/pages/environments.scss
View file @ 1906a32b
...@@ -63,19 +63,19 @@ ...@@ -63,19 +63,19 @@
} }
} }
} }
.children-row .environment-name { .children-row .environment-name {
margin-left: 17px; margin-left: 17px;
margin-right: -17px; margin-right: -17px;
} }
.folder-icon { .folder-icon {
padding: 0 5px 0 0; padding: 0 5px 0 0;
} }
.folder-name { .folder-name {
cursor: pointer; cursor: pointer;
.badge { .badge {
font-weight: normal; font-weight: normal;
background-color: $gray-darker; background-color: $gray-darker;
......
app/views/projects/environments/index.html.haml
View file @ 1906a32b
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
= link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do = link_to new_namespace_project_environment_path(@project.namespace, @project), class: 'btn btn-create' do
New environment New environment
.table-holder{ "v-if" => "!loading && state.environments" } .table-holder{ "v-if" => "!loading && state.environments.length" }
%table.table.ci-table.environments %table.table.ci-table.environments
%thead %thead
%th Environment %th Environment
......
spec/features/environments_spec.rb
View file @ 1906a32b
...@@ -12,18 +12,32 @@ feature 'Environments', feature: true, js:true do ...@@ -12,18 +12,32 @@ feature 'Environments', feature: true, js:true do
login_as(user) login_as(user)
project.team << [user, role] project.team << [user, role]
end end
describe 'when showing environments' do describe 'Loading environments' do
given!(:environment) { } given!(:environment) { }
given!(:deployment) { } given!(:deployment) { }
given!(:manual) { } given!(:manual) { }
context 'without environments' do context 'loading environments' do
before do before do
visit namespace_project_environments_path(project.namespace, project) visit namespace_project_environments_path(project.namespace, project)
wait_for_vue_resource
end 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 scenario 'does show "Available" and "Stopped" tab with links' do
expect(page).to have_link('Available') expect(page).to have_link('Available')
expect(page).to have_link('Stopped') expect(page).to have_link('Stopped')
...@@ -38,37 +52,17 @@ feature 'Environments', feature: true, js:true do ...@@ -38,37 +52,17 @@ feature 'Environments', feature: true, js:true do
expect(page.find('.js-stopped-environments-count').text).to eq('0') expect(page.find('.js-stopped-environments-count').text).to eq('0')
end end
end end
context 'loading environments' do
given(:environment) { create(:environment, project: project) }
before do
visit namespace_project_environments_path(project.namespace, project)
wait_for_vue_resource
end
scenario 'does show loading spinner' do
expect(page).to have_selector('.environments-list-loading')
end
end
context 'with environments' do context 'with environments' do
let(:environment1) { create(:environment, project: project) } given!(:environment) { create(:environment, project: project) }
let(:environment2) { create(:environment, project: project) }
before do
visit namespace_project_environments_path(project.namespace, project)
wait_for_vue_resource
expect(page).to have_selector('.table.ci-table.environments')
end
scenario 'does show "Available" and "Stopped" tab with links' do scenario 'does show "Available" and "Stopped" tab with links' do
expect(page).to have_link('Stopped') expect(page).to have_link('Stopped')
expect(page).to have_link('Available') expect(page).to have_link('Available')
end end
scenario 'does show environment name' do scenario 'does show environment name' do
expect(page).to have_link(environment1.name) expect(page).to have_link(environment.name)
end end
scenario 'does show number of available and stopped environments' do scenario 'does show number of available and stopped environments' do
...@@ -77,85 +71,92 @@ feature 'Environments', feature: true, js:true do ...@@ -77,85 +71,92 @@ feature 'Environments', feature: true, js:true do
end end
context 'without deployments' do context 'without deployments' do
before do
visit namespace_project_environments_path(project.namespace, project)
wait_for_vue_resource
end
scenario 'does show no deployments' do scenario 'does show no deployments' do
expect(page).to have_content('No deployments yet') expect(page).to have_content('No deployments yet')
end end
end end
# context 'with deployments' do context 'with deployments' do
# given(:deployment) { create(:deployment, environment: environment) } let!(:environment) { create(:environment, project: project) }
# given(:deployment) { create(:deployment, environment: environment) }
# scenario 'does show deployment SHA' do
# expect(page).to have_link(deployment.short_sha) scenario 'does show deployment SHA' do
# end expect(page).to have_link(deployment.short_sha)
# end
# scenario 'does show deployment internal id' do
# expect(page).to have_content(deployment.iid) scenario 'does show deployment internal id' do
# end expect(page).to have_content(deployment.iid)
# end
# context 'with build and manual actions' do
# given(:pipeline) { create(:ci_pipeline, project: project) } context 'with build and manual actions' do
# given(:build) { create(:ci_build, pipeline: pipeline) } given(:pipeline) { create(:ci_pipeline, project: project) }
# given(:deployment) { create(:deployment, environment: environment, deployable: build) } given(:build) { create(:ci_build, pipeline: pipeline) }
# given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') } given(:deployment) { create(:deployment, environment: environment, deployable: build) }
# given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') }
# scenario 'does show a play button' do
# expect(page).to have_link(manual.name.humanize) scenario 'does show a play button' do
# end expect(page).to have_link(manual.name.humanize)
# end
# scenario 'does allow to play manual action' do
# expect(manual).to be_skipped scenario 'does allow to play manual action' do
# expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count } expect(manual).to be_skipped
# expect(page).to have_content(manual.name) expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count }
# expect(manual.reload).to be_pending expect(page).to have_content(manual.name)
# end expect(manual.reload).to be_pending
# end
# scenario 'does show build name and id' do
# expect(page).to have_link("#{build.name} (##{build.id})") scenario 'does show build name and id' do
# end expect(page).to have_link("#{build.name} (##{build.id})")
# end
# scenario 'does not show stop button' do
# expect(page).not_to have_selector('.stop-env-link') scenario 'does not show stop button' do
# end expect(page).not_to have_selector('.stop-env-link')
# end
# scenario 'does not show external link button' do
# expect(page).not_to have_css('external-url') scenario 'does not show external link button' do
# end expect(page).not_to have_css('external-url')
# end
# # context 'with external_url' do
# given(:environment) { create(:environment, project: project, external_url: 'https://git.gitlab.com') } context 'with external_url' do
# given(:build) { create(:ci_build, pipeline: pipeline) } given(:environment) { create(:environment, project: project, external_url: 'https://git.gitlab.com') }
# given(:deployment) { create(:deployment, environment: environment, deployable: build) } given(:build) { create(:ci_build, pipeline: pipeline) }
# given(:deployment) { create(:deployment, environment: environment, deployable: build) }
# scenario 'does show an external link button' do
# expect(page).to have_link(nil, href: environment.external_url) scenario 'does show an external link button' do
# end expect(page).to have_link(nil, href: environment.external_url)
# end end
# end
# # context 'with stop action' do
# given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') } context 'with stop action' do
# given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') } given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
# given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') }
# scenario 'does show stop button' do
# expect(page).to have_selector('.stop-env-link') scenario 'does show stop button' do
# end expect(page).to have_selector('.stop-env-link')
# end
# scenario 'starts build when stop button clicked' do
# first('.stop-env-link').click scenario 'starts build when stop button clicked' do
# first('.stop-env-link').click
# expect(page).to have_content('close_app')
# end expect(page).to have_content('close_app')
# end
# context 'for reporter' do
# let(:role) { :reporter } context 'for reporter' do
# let(:role) { :reporter }
# scenario 'does not show stop button' do
# expect(page).not_to have_selector('.stop-env-link') scenario 'does not show stop button' do
# end expect(page).not_to have_selector('.stop-env-link')
# end end
# end end
# end end
# end end
end
end end
context 'can create new environment' do context 'can create new environment' do
...@@ -170,139 +171,139 @@ feature 'Environments', feature: true, js:true do ...@@ -170,139 +171,139 @@ feature 'Environments', feature: true, js:true do
end end
end end
# describe 'when showing the environment' do describe 'when showing the environment' do
# given(:environment) { create(:environment, project: project) } given(:environment) { create(:environment, project: project) }
# given!(:deployment) { } given!(:deployment) { }
# given!(:manual) { } given!(:manual) { }
#
# before do before do
# visit namespace_project_environment_path(project.namespace, project, environment) visit namespace_project_environment_path(project.namespace, project, environment)
# end end
#
# context 'without deployments' do context 'without deployments' do
# scenario 'does show no deployments' do scenario 'does show no deployments' do
# expect(page).to have_content('You don\'t have any deployments right now.') expect(page).to have_content('You don\'t have any deployments right now.')
# end end
# end end
#
# context 'with deployments' do context 'with deployments' do
# given(:deployment) { create(:deployment, environment: environment) } given(:deployment) { create(:deployment, environment: environment) }
#
# scenario 'does show deployment SHA' do scenario 'does show deployment SHA' do
# expect(page).to have_link(deployment.short_sha) expect(page).to have_link(deployment.short_sha)
# end end
#
# scenario 'does not show a re-deploy button for deployment without build' do scenario 'does not show a re-deploy button for deployment without build' do
# expect(page).not_to have_link('Re-deploy') expect(page).not_to have_link('Re-deploy')
# end end
#
# context 'with build' do context 'with build' do
# given(:pipeline) { create(:ci_pipeline, project: project) } given(:pipeline) { create(:ci_pipeline, project: project) }
# given(:build) { create(:ci_build, pipeline: pipeline) } given(:build) { create(:ci_build, pipeline: pipeline) }
# given(:deployment) { create(:deployment, environment: environment, deployable: build) } given(:deployment) { create(:deployment, environment: environment, deployable: build) }
#
# scenario 'does show build name' do scenario 'does show build name' do
# expect(page).to have_link("#{build.name} (##{build.id})") expect(page).to have_link("#{build.name} (##{build.id})")
# end end
#
# scenario 'does show re-deploy button' do scenario 'does show re-deploy button' do
# expect(page).to have_link('Re-deploy') expect(page).to have_link('Re-deploy')
# end end
#
# scenario 'does not show stop button' do scenario 'does not show stop button' do
# expect(page).not_to have_link('Stop') expect(page).not_to have_link('Stop')
# end end
#
# context 'with manual action' do context 'with manual action' do
# given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') } given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') }
#
# scenario 'does show a play button' do scenario 'does show a play button' do
# expect(page).to have_link(manual.name.humanize) expect(page).to have_link(manual.name.humanize)
# end end
#
# scenario 'does allow to play manual action' do scenario 'does allow to play manual action' do
# expect(manual).to be_skipped expect(manual).to be_skipped
# expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count } expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count }
# expect(page).to have_content(manual.name) expect(page).to have_content(manual.name)
# expect(manual.reload).to be_pending expect(manual.reload).to be_pending
# end end
#
# context 'with external_url' do context 'with external_url' do
# given(:environment) { create(:environment, project: project, external_url: 'https://git.gitlab.com') } given(:environment) { create(:environment, project: project, external_url: 'https://git.gitlab.com') }
# given(:build) { create(:ci_build, pipeline: pipeline) } given(:build) { create(:ci_build, pipeline: pipeline) }
# given(:deployment) { create(:deployment, environment: environment, deployable: build) } given(:deployment) { create(:deployment, environment: environment, deployable: build) }
#
# scenario 'does show an external link button' do scenario 'does show an external link button' do
# expect(page).to have_link(nil, href: environment.external_url) expect(page).to have_link(nil, href: environment.external_url)
# end end
# end end
#
# context 'with stop action' do context 'with stop action' do
# given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') } given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
# given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') } given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') }
#
# scenario 'does show stop button' do scenario 'does show stop button' do
# expect(page).to have_link('Stop') expect(page).to have_link('Stop')
# end end
#
# scenario 'does allow to stop environment' do scenario 'does allow to stop environment' do
# click_link('Stop') click_link('Stop')
#
# expect(page).to have_content('close_app') expect(page).to have_content('close_app')
# end end
#
# context 'for reporter' do context 'for reporter' do
# let(:role) { :reporter } let(:role) { :reporter }
#
# scenario 'does not show stop button' do scenario 'does not show stop button' do
# expect(page).not_to have_link('Stop') expect(page).not_to have_link('Stop')
# end end
# end end
# end end
# end end
# end end
# end end
# end end
# describe 'when creating a new environment' do describe 'when creating a new environment' do
# before do before do
# visit namespace_project_environments_path(project.namespace, project) visit namespace_project_environments_path(project.namespace, project)
# end end
#
# context 'when logged as developer' do context 'when logged as developer' do
# before do before do
# click_link 'New environment' click_link 'New environment'
# end end
#
# context 'for valid name' do context 'for valid name' do
# before do before do
# fill_in('Name', with: 'production') fill_in('Name', with: 'production')
# click_on 'Save' click_on 'Save'
# end end
#
# scenario 'does create a new pipeline' do scenario 'does create a new pipeline' do
# expect(page).to have_content('Production') expect(page).to have_content('Production')
# end end
# end end
#
# context 'for invalid name' do context 'for invalid name' do
# before do before do
# fill_in('Name', with: 'name,with,commas') fill_in('Name', with: 'name,with,commas')
# click_on 'Save' click_on 'Save'
# end end
#
# scenario 'does show errors' do scenario 'does show errors' do
# expect(page).to have_content('Name can contain only letters') expect(page).to have_content('Name can contain only letters')
# end end
# end end
# end end
#
# context 'when logged as reporter' do context 'when logged as reporter' do
# given(:role) { :reporter } given(:role) { :reporter }
#
# scenario 'does not have a New environment link' do scenario 'does not have a New environment link' do
# expect(page).not_to have_link('New environment') expect(page).not_to have_link('New environment')
# end end
# end end
# end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7