Commit 691644dc authored by ubudzisz's avatar ubudzisz

add feature test

add feature test

add feature test

add feature test

remove test to builds_spec

remove feature test to builds_spec

remove feature test to builds_spec

add changes to methods and remove FactoryGirl

add changes to methods and remove FactoryGirl

adding changes to test and js file

changes grammar

update changelog

rename file name

update files after review

update files after review

update files after review
parent 0893911d
...@@ -88,6 +88,7 @@ v 8.12.0 (unreleased) ...@@ -88,6 +88,7 @@ v 8.12.0 (unreleased)
- Fixed invisible scroll controls on build page on iPhone - Fixed invisible scroll controls on build page on iPhone
- Fix error on raw build trace download for old builds stored in database !4822 - Fix error on raw build trace download for old builds stored in database !4822
- Refactor the triggers page and documentation !6217 - Refactor the triggers page and documentation !6217
- Show values of CI trigger variables only when clicked (Katarzyna Kobierska Ula Budziszewska)
v 8.11.5 (unreleased) v 8.11.5 (unreleased)
- Optimize branch lookups and force a repository reload for Repository#find_branch - Optimize branch lookups and force a repository reload for Repository#find_branch
...@@ -130,9 +131,6 @@ v 8.11.2 ...@@ -130,9 +131,6 @@ v 8.11.2
- Show "Create Merge Request" widget for push events to fork projects on the source project. !5978 - Show "Create Merge Request" widget for push events to fork projects on the source project. !5978
- Use gitlab-workhorse 0.7.11 !5983 - Use gitlab-workhorse 0.7.11 !5983
- Does not halt the GitHub import process when an error occurs. !5763 - Does not halt the GitHub import process when an error occurs. !5763
- Show value variables onclick (Katarzyna Kobierska Ula Budziszewska)
v 8.11.1 (unreleased)
- Fix file links on project page when default view is Files !5933 - Fix file links on project page when default view is Files !5933
- Fixed enter key in search input not working !5888 - Fixed enter key in search input not working !5888
......
$(function(){ $(function(){
$('.reveal-variables').off('click').on('click',function(){ $('.reveal-variables').off('click').on('click',function(){
$('.js-build-variable').toggle(); $('.js-build').toggle().niceScroll();
$('.js-build-value').toggle().niceScroll(); $(this).hide();
$('.reveal-variables').show();
}); });
}); });
...@@ -228,14 +228,12 @@ header.header-pinned-nav { ...@@ -228,14 +228,12 @@ header.header-pinned-nav {
} }
.js-build-variable { .js-build-variable {
color: #c7254e; color: $code-color;
font-size: 100%;
border-radius: 5px;
} }
.js-build-value { .js-build-value {
padding: 2px 4px; padding: 2px 4px;
font-size: 100%; font-size: 100%;
color: #000; color: $black;
background-color: #fff; background-color: $white-light;
} }
...@@ -94,8 +94,9 @@ ...@@ -94,8 +94,9 @@
- @build.trigger_request.variables.each do |key, value| - @build.trigger_request.variables.each do |key, value|
.hide.js-build-variable #{key} .hide.js-build
.hide.js-build-value #{value} .js-build-variable= key
.js-build-value= value
.block .block
.title .title
......
...@@ -164,6 +164,26 @@ describe "Builds" do ...@@ -164,6 +164,26 @@ describe "Builds" do
expect(page).to have_link 'Raw' expect(page).to have_link 'Raw'
end end
end end
describe 'Variables' do
before do
@trigger_request = create :ci_trigger_request_with_variables
@build = create :ci_build, pipeline: @commit, trigger_request: @trigger_request
visit namespace_project_build_path(@project.namespace, @project, @build)
end
it 'shows variable key and value after click', js: true do
expect(page).to have_css('.reveal-variables')
expect(page).not_to have_css('.js-build-variable')
expect(page).not_to have_css('.js-build-value')
find('.reveal-variables').click
expect(page).not_to have_css('.reveal-variables')
expect(page).to have_selector('.js-build-variable', text: 'TRIGGER_KEY_1')
expect(page).to have_selector('.js-build-value', text: 'TRIGGER_VALUE_1')
end
end
end end
describe "POST /:project/builds/:id/cancel" do describe "POST /:project/builds/:id/cancel" do
......
...@@ -59,20 +59,10 @@ describe 'projects/builds/show' do ...@@ -59,20 +59,10 @@ describe 'projects/builds/show' do
end end
it 'shows trigger variables in separate lines' do it 'shows trigger variables in separate lines' do
expect(rendered).to have_css('.js-build-variable', visible: false, text: variable_regexp_key('TRIGGER_KEY_1')) expect(rendered).to have_css('.js-build-variable', visible: false, text: 'TRIGGER_KEY_1')
expect(rendered).to have_css('.js-build-variable', visible: false, text: variable_regexp_key('TRIGGER_KEY_2')) expect(rendered).to have_css('.js-build-variable', visible: false, text: 'TRIGGER_KEY_2')
expect(rendered).to have_css('.js-build-value', visible: false, text: variable_regexp_value('TRIGGER_VALUE_1')) expect(rendered).to have_css('.js-build-value', visible: false, text: 'TRIGGER_VALUE_1')
expect(rendered).to have_css('.js-build-value', visible: false, text: variable_regexp_value('TRIGGER_VALUE_2')) expect(rendered).to have_css('.js-build-value', visible: false, text: 'TRIGGER_VALUE_2')
end end
end end
private
def variable_regexp_key(key)
/\A#{Regexp.escape("#{key}")}\Z/
end
def variable_regexp_value(value)
/\A#{Regexp.escape("#{value}")}\Z/
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