Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fields

# Conflicts:
#   doc/api/v3_to_v4.md

1 files changed, 26 insertions, 2 deletions

diff --git a/spec/features/variables_spec.rb b/spec/features/variables_spec.rb
index 9a4bc027004..a362d6fd3b6 100644
--- a/spec/features/variables_spec.rb
+++ b/spec/features/variables_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Project variables', js: true do
   let(:user)     { create(:user) }
   let(:project)  { create(:project) }
-  let(:variable) { create(:ci_variable, key: 'test') }
+  let(:variable) { create(:ci_variable, key: 'test_key', value: 'test value') }
 
   before do
     login_as(user)
@@ -24,11 +24,23 @@ describe 'Project variables', js: true do
     fill_in('variable_value', with: 'key value')
     click_button('Add new variable')
 
+    expect(page).to have_content('Variables were successfully updated.')
     page.within('.variables-table') do
       expect(page).to have_content('key')
     end
   end
 
+  it 'adds empty variable' do
+    fill_in('variable_key', with: 'new_key')
+    fill_in('variable_value', with: '')
+    click_button('Add new variable')
+
+    expect(page).to have_content('Variables were successfully updated.')
+    page.within('.variables-table') do
+      expect(page).to have_content('new_key')
+    end
+  end
+
   it 'reveals and hides new variable' do
     fill_in('variable_key', with: 'key')
     fill_in('variable_value', with: 'key value')
@@ -72,8 +84,20 @@ describe 'Project variables', js: true do
     fill_in('variable_value', with: 'key value')
     click_button('Save variable')
 
+    expect(page).to have_content('Variable was successfully updated.')
+    expect(project.variables.first.value).to eq('key value')
+  end
+
+  it 'edits variable with empty value' do
     page.within('.variables-table') do
-      expect(page).to have_content('key')
+      find('.btn-variable-edit').click
     end
+
+    expect(page).to have_content('Update variable')
+    fill_in('variable_value', with: '')
+    click_button('Save variable')
+
+    expect(page).to have_content('Variable was successfully updated.')
+    expect(project.variables.first.value).to eq('')
   end
 end