diff options
author | Stan Hu <stanhu@gmail.com> | 2016-12-19 03:47:49 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-12-19 03:47:49 +0000 |
commit | 5be894fd46d96f4b6dfd6b8e7e7d99d5e35aacae (patch) | |
tree | a7721d69b0b4407c094fe250a43b0f865733842e | |
parent | 1a366e25889bcbff7d731f30769c849aedef4010 (diff) | |
parent | f8dde43d418d0a9f5a3ead75481cf9bfe8c2e7c6 (diff) | |
download | gitlab-ce-5be894fd46d96f4b6dfd6b8e7e7d99d5e35aacae.tar.gz |
Merge branch 'fix-groups-helper-spec' into 'master'
Always use `fixture_file_upload` helper to upload files in tests.
## What does this MR do?
Fix a broken spec.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
See merge request !8164
-rw-r--r-- | spec/helpers/groups_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb index 233d00534e5..c8b0d86425f 100644 --- a/spec/helpers/groups_helper_spec.rb +++ b/spec/helpers/groups_helper_spec.rb @@ -6,7 +6,7 @@ describe GroupsHelper do it 'returns an url for the avatar' do group = create(:group) - group.avatar = File.open(avatar_file_path) + group.avatar = fixture_file_upload(avatar_file_path) group.save! expect(group_icon(group.path).to_s). to match("/uploads/group/avatar/#{group.id}/banana_sample.gif") |