diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-02-24 21:57:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-02-24 21:57:47 +0000 |
| commit | 6e2f2f5da7387c7813b23304f51e917596f2b170 (patch) | |
| tree | 5e56761cb271fd82f6bd6a77214fdef92d91a637 /spec/factories | |
| parent | 1f8d6c790a8493a341f1786710aac36621e93bf6 (diff) | |
| parent | 705f15587bfbfde33ae10f7820e66370a054ad5a (diff) | |
| download | gitlab-ce-6e2f2f5da7387c7813b23304f51e917596f2b170.tar.gz | |
Merge branch 'dm-fix-web-edit-new-lines' into 'master'
Consistently create, update, and delete files, taking CRLF settings into account
See merge request !9207
Diffstat (limited to 'spec/factories')
| -rw-r--r-- | spec/factories/projects.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index c80b09e9b9d..586efdefdb3 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -138,27 +138,24 @@ FactoryGirl.define do project.add_user(args[:user], args[:access]) - project.repository.commit_file( + project.repository.create_file( args[:user], ".gitlab/#{args[:path]}/bug.md", 'something valid', message: 'test 3', - branch_name: 'master', - update: false) - project.repository.commit_file( + branch_name: 'master') + project.repository.create_file( args[:user], ".gitlab/#{args[:path]}/template_test.md", 'template_test', message: 'test 1', - branch_name: 'master', - update: false) - project.repository.commit_file( + branch_name: 'master') + project.repository.create_file( args[:user], ".gitlab/#{args[:path]}/feature_proposal.md", 'feature_proposal', message: 'test 2', - branch_name: 'master', - update: false) + branch_name: 'master') end end end |