Commit ff5f3560 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ce-6114-move-some-features-projects-specs' into 'master'

CE: Resolve "Extract EE specific files/lines for some projects features specs"

See merge request gitlab-org/gitlab-ce!19084
parents 4d3b313a 2b92cca8
...@@ -14,6 +14,8 @@ feature 'File blob', :js do ...@@ -14,6 +14,8 @@ feature 'File blob', :js do
context 'Ruby file' do context 'Ruby file' do
before do before do
visit_blob('files/ruby/popen.rb') visit_blob('files/ruby/popen.rb')
wait_for_requests
end end
it 'displays the blob' do it 'displays the blob' do
...@@ -48,6 +50,8 @@ feature 'File blob', :js do ...@@ -48,6 +50,8 @@ feature 'File blob', :js do
context 'visiting directly' do context 'visiting directly' do
before do before do
visit_blob('files/markdown/ruby-style-guide.md') visit_blob('files/markdown/ruby-style-guide.md')
wait_for_requests
end end
it 'displays the blob using the rich viewer' do it 'displays the blob using the rich viewer' do
...@@ -159,6 +163,8 @@ feature 'File blob', :js do ...@@ -159,6 +163,8 @@ feature 'File blob', :js do
project.update_attribute(:lfs_enabled, true) project.update_attribute(:lfs_enabled, true)
visit_blob('files/lfs/file.md') visit_blob('files/lfs/file.md')
wait_for_requests
end end
it 'displays an error' do it 'displays an error' do
...@@ -207,6 +213,8 @@ feature 'File blob', :js do ...@@ -207,6 +213,8 @@ feature 'File blob', :js do
context 'when LFS is disabled on the project' do context 'when LFS is disabled on the project' do
before do before do
visit_blob('files/lfs/file.md') visit_blob('files/lfs/file.md')
wait_for_requests
end end
it 'displays the blob' do it 'displays the blob' do
...@@ -242,6 +250,8 @@ feature 'File blob', :js do ...@@ -242,6 +250,8 @@ feature 'File blob', :js do
).execute ).execute
visit_blob('files/test.pdf') visit_blob('files/test.pdf')
wait_for_requests
end end
it 'displays the blob' do it 'displays the blob' do
...@@ -268,6 +278,8 @@ feature 'File blob', :js do ...@@ -268,6 +278,8 @@ feature 'File blob', :js do
project.update_attribute(:lfs_enabled, true) project.update_attribute(:lfs_enabled, true)
visit_blob('files/lfs/lfs_object.iso') visit_blob('files/lfs/lfs_object.iso')
wait_for_requests
end end
it 'displays the blob' do it 'displays the blob' do
...@@ -290,6 +302,8 @@ feature 'File blob', :js do ...@@ -290,6 +302,8 @@ feature 'File blob', :js do
context 'when LFS is disabled on the project' do context 'when LFS is disabled on the project' do
before do before do
visit_blob('files/lfs/lfs_object.iso') visit_blob('files/lfs/lfs_object.iso')
wait_for_requests
end end
it 'displays the blob' do it 'displays the blob' do
...@@ -313,6 +327,8 @@ feature 'File blob', :js do ...@@ -313,6 +327,8 @@ feature 'File blob', :js do
context 'ZIP file' do context 'ZIP file' do
before do before do
visit_blob('Gemfile.zip') visit_blob('Gemfile.zip')
wait_for_requests
end end
it 'displays the blob' do it 'displays the blob' do
...@@ -347,6 +363,8 @@ feature 'File blob', :js do ...@@ -347,6 +363,8 @@ feature 'File blob', :js do
).execute ).execute
visit_blob('files/empty.md') visit_blob('files/empty.md')
wait_for_requests
end end
it 'displays an error' do it 'displays an error' do
......
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