summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-11 15:22:15 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-11 15:22:15 +0000
commite6a23d6bc86e0c8231304183d6e1f8ba69599e86 (patch)
treea7b7c1d8c3f558df272cebf7d7c1e4dda68d207c
parentdf3ad3fe1bd8bd94ff81a344af5eb79a018d7729 (diff)
parent85df1bf02dbcd180ad7db0c0e3c609671dac1a11 (diff)
downloadgitlab-ce-e6a23d6bc86e0c8231304183d6e1f8ba69599e86.tar.gz
Merge branch 'remove-empty-describe' into 'master'
Remove empty describe block on key spec model ## What does this MR do? Removes unnecessary describe in test ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? It describe block not needed. ## Screenshots (if relevant) No ## Does this MR meet the acceptance criteria? - n/a [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - n/a [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - n/a API support added - Tests - n/a Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] 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? No See merge request !6793
-rw-r--r--spec/models/key_spec.rb3
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index fd4a2beff58..7fc6ed1dd54 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -5,9 +5,6 @@ describe Key, models: true do
it { is_expected.to belong_to(:user) }
end
- describe "Mass assignment" do
- end
-
describe "Validation" do
it { is_expected.to validate_presence_of(:title) }
it { is_expected.to validate_presence_of(:key) }