summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-10-01 18:20:23 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-10-01 18:20:23 +0000
commit0088420ab898a5922869aeb0a06ef459d9f728ff (patch)
treed477bdbb483b370a2be846fab08b0b5cc32a70d6
parent60b92c551d6f2a98c50e7e163197ef40ad3c7c0d (diff)
parent89e663122b1c114f9b7566cd42c5bbee4873430a (diff)
downloadgitlab-ce-0088420ab898a5922869aeb0a06ef459d9f728ff.tar.gz
Merge branch 'fix-calendar-spec' into 'master'
Changed zero padded days to no padded days in date_format ## What does this MR do? Changed zero padded days to no padded days in date_format so that calendar spec tests will pass. Specs were failing because it was looking for `Saturday Oct 01, 2016` when it should have been looking for `Saturday Oct 1, 2016` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Fixes failing test ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - Tests - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22861 See merge request !6634
-rw-r--r--spec/features/calendar_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/features/calendar_spec.rb b/spec/features/calendar_spec.rb
index f52682f229c..7fa0c95cae2 100644
--- a/spec/features/calendar_spec.rb
+++ b/spec/features/calendar_spec.rb
@@ -5,7 +5,9 @@ feature 'Contributions Calendar', js: true, feature: true do
let(:contributed_project) { create(:project, :public) }
- date_format = '%A %b %d, %Y'
+ # Ex/ Sunday Jan 1, 2016
+ date_format = '%A %b %-d, %Y'
+
issue_title = 'Bug in old browser'
issue_params = { title: issue_title }