diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-04-18 09:18:58 +0200 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-04-22 11:08:06 +0200 |
commit | ac6e243e94f473f6dba4d7edf54201a8c774f236 (patch) | |
tree | 8daea80d050ef6ac9695ef31eea0d10a42ea54ba | |
parent | 0dad321d3b65f4417d80e8d9f314e93b70bc4ade (diff) | |
download | gitlab-ce-zj-dockerfiles.tar.gz |
Fix Dockerfile dropdown testzj-dockerfiles
The test was failing as there was no file in the directory, by copying
the fixture, now there is.
-rw-r--r-- | spec/features/projects/files/dockerfile_dropdown_spec.rb | 15 | ||||
-rw-r--r-- | spec/fixtures/HTTPd.Dockerfile | 4 |
2 files changed, 19 insertions, 0 deletions
diff --git a/spec/features/projects/files/dockerfile_dropdown_spec.rb b/spec/features/projects/files/dockerfile_dropdown_spec.rb index 32f33a3ca97..20c6448699b 100644 --- a/spec/features/projects/files/dockerfile_dropdown_spec.rb +++ b/spec/features/projects/files/dockerfile_dropdown_spec.rb @@ -1,4 +1,5 @@ require 'spec_helper' +require 'fileutils' feature 'User wants to add a Dockerfile file', feature: true do include WaitForAjax @@ -7,24 +8,38 @@ feature 'User wants to add a Dockerfile file', feature: true do user = create(:user) project = create(:project) project.team << [user, :master] + login_as user + FileUtils.cp(Rails.root.join('spec/fixtures/HTTPd.Dockerfile'), dockerfile_directory) + visit namespace_project_new_blob_path(project.namespace, project, 'master', file_name: 'Dockerfile') end + after do + FileUtils.rm_rf(Dir.glob(dockerfile_directory + '*')) + end + scenario 'user can see Dockerfile dropdown' do expect(page).to have_css('.dockerfile-selector') end scenario 'user can pick a Dockerfile file from the dropdown', js: true do find('.js-dockerfile-selector').click + wait_for_ajax + within '.dockerfile-selector' do find('.dropdown-input-field').set('HTTPd') find('.dropdown-content li', text: 'HTTPd').click end + wait_for_ajax expect(page).to have_css('.dockerfile-selector .dropdown-toggle-text', text: 'HTTPd') expect(page).to have_content('COPY ./ /usr/local/apache2/htdocs/') end + + def dockerfile_directory + Rails.root.join('vendor/Dockerfile/') + end end diff --git a/spec/fixtures/HTTPd.Dockerfile b/spec/fixtures/HTTPd.Dockerfile new file mode 100644 index 00000000000..4b3e04abfa6 --- /dev/null +++ b/spec/fixtures/HTTPd.Dockerfile @@ -0,0 +1,4 @@ +FROM httpd:alpine + +COPY ./ /usr/local/apache2/htdocs/ + |