add feature test

CHANGELOG

@@ -88,6 +88,7 @@ v 8.12.0 (unreleased)
   - Fixed invisible scroll controls on build page on iPhone
   - Fix error on raw build trace download for old builds stored in database !4822
   - 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)
   - Optimize branch lookups and force a repository reload for Repository#find_branch
@@ -130,9 +131,6 @@ v 8.11.2
   - Show "Create Merge Request" widget for push events to fork projects on the source project. !5978
   - Use gitlab-workhorse 0.7.11 !5983
   - 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
   - Fixed enter key in search input not working !5888
 

app/assets/javascripts/build_variables.js → app/assets/javascripts/build_variables.js.es6

 $(function(){
   $('.reveal-variables').off('click').on('click',function(){
-    $('.js-build-variable').toggle();
-    $('.js-build-value').toggle().niceScroll();
-    $('.reveal-variables').show();
+    $('.js-build').toggle().niceScroll();
+    $(this).hide();
   });
 });

app/assets/stylesheets/framework/sidebar.scss

@@ -228,14 +228,12 @@ header.header-pinned-nav {
 }
 
 .js-build-variable {
-  color: #c7254e;
-  font-size: 100%;
-  border-radius: 5px;
+  color: $code-color;
 }
 
 .js-build-value {
   padding: 2px 4px;
   font-size: 100%;
-  color: #000;
-  background-color: #fff;
+  color: $black;
+  background-color: $white-light;
 }

app/views/projects/builds/_sidebar.html.haml

@@ -94,8 +94,9 @@
 
 
           - @build.trigger_request.variables.each do |key, value|
-            .hide.js-build-variable #{key} 
-            .hide.js-build-value  #{value}
+            .hide.js-build
+              .js-build-variable= key 
+              .js-build-value= value
 
     .block
       .title

spec/features/projects/builds_spec.rb

@@ -164,6 +164,26 @@ describe "Builds" do
         expect(page).to have_link 'Raw'
       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
 
   describe "POST /:project/builds/:id/cancel" do

spec/views/projects/builds/show.html.haml_spec.rb

@@ -59,20 +59,10 @@ describe 'projects/builds/show' do
     end
 
     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: variable_regexp_key('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: variable_regexp_value('TRIGGER_VALUE_2'))
+      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: 'TRIGGER_KEY_2')
+      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: 'TRIGGER_VALUE_2')
     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