Preserve trailing new lines at the end of file on the online editor

Because Haml automatically indents the HTML source code, the contents
of whitespace-sensitive tags like pre and textarea can get screwed up.

2 files changed, 19 insertions, 0 deletions

diff --git a/features/project/source/browse_files.feature b/features/project/source/browse_files.feature
index 439787f2641..02159ee3776 100644
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -35,6 +35,17 @@ Feature: Project Source Browse Files
     And I should see its new content
 
   @javascript
+  Scenario: I can create and commit file with new lines at the end of file
+    Given I click on "New file" link in repo
+    And I edit code with new lines at end of file
+    And I fill the new file name
+    And I fill the commit message
+    And I click on "Commit Changes"
+    Then I am redirected to the new file
+    And I click button "Edit"
+    And I should see its content with new lines preserved at end of file
+
+  @javascript
   Scenario: I can upload file and commit
     Given I click on "Upload file" link in repo
     And I upload a new text file
diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb
index f2b95764267..b88709620ab 100644
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -37,6 +37,10 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     expect(page).to have_content new_gitignore_content
   end
 
+  step 'I should see its content with new lines preserved at end of file' do
+    expect(evaluate_script('blob.editor.getValue()')).to eq "Sample\n\n\n"
+  end
+
   step 'I click link "Raw"' do
     click_link 'Raw'
   end
@@ -62,6 +66,10 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
     set_new_content
   end
 
+  step 'I edit code with new lines at end of file' do
+    execute_script('blob.editor.setValue("Sample\n\n\n")')
+  end
+
   step 'I fill the new file name' do
     fill_in :file_name, with: new_file_name
   end