Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
backup
Drip
Commits
a2c428e9
Commit
a2c428e9
authored
6 years ago
by
Julia Friesel
Browse files
Options
Downloads
Patches
Plain Diff
Shorten line lengths in cycle
parent
63154be2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/cycle.js
+4
-3
4 additions, 3 deletions
lib/cycle.js
test/cycle.spec.js
+17
-7
17 additions, 7 deletions
test/cycle.spec.js
with
21 additions
and
10 deletions
lib/cycle.js
+
4
−
3
View file @
a2c428e9
...
...
@@ -28,19 +28,20 @@ export default function config(opts) {
return
day
})
const
firstBleedingBeforeTargetDayIndex
=
withWrappedDates
.
findIndex
(
day
=>
{
// the index of the first bleeding day before the target day
const
index
=
withWrappedDates
.
findIndex
(
day
=>
{
return
(
day
.
wrappedDate
.
isEqual
(
targetDate
)
||
day
.
wrappedDate
.
isBefore
(
targetDate
)
)
})
if
(
firstBleedingBeforeTargetDayI
ndex
<
0
)
{
if
(
i
ndex
<
0
)
{
withWrappedDates
.
forEach
(
day
=>
delete
day
.
wrappedDate
)
return
null
}
const
prevBleedingDays
=
withWrappedDates
.
slice
(
firstBleedingBeforeTargetDayI
ndex
)
const
prevBleedingDays
=
withWrappedDates
.
slice
(
i
ndex
)
const
lastMensesStart
=
prevBleedingDays
.
find
((
day
,
i
)
=>
{
return
noBleedingDayWithinThreshold
(
day
,
prevBleedingDays
.
slice
(
i
+
1
))
...
...
This diff is collapsed.
Click to expand it.
test/cycle.spec.js
+
17
−
7
View file @
a2c428e9
...
...
@@ -5,6 +5,10 @@ import cycleModule from '../lib/cycle'
const
expect
=
chai
.
expect
chai
.
use
(
dirtyChai
)
function
useBleedingDays
(
days
)
{
return
cycleModule
({
bleedingDaysSortedByDate
:
days
}).
getCycleDayNumber
}
describe
(
'
getCycleDay
'
,
()
=>
{
it
(
'
works for a simple example
'
,
()
=>
{
const
bleedingDays
=
[{
...
...
@@ -23,7 +27,7 @@ describe('getCycleDay', () => {
value
:
2
}
}]
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
}).
getCycleDayNumber
const
getCycleDayNumber
=
useBleedingDays
(
bleedingDays
)
const
targetDate
=
'
2018-05-17
'
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
eql
(
9
)
...
...
@@ -49,7 +53,7 @@ describe('getCycleDay', () => {
}
}]
const
targetDate
=
'
2018-05-17
'
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
}).
getCycleDayNumber
const
getCycleDayNumber
=
useBleedingDays
(
bleedingDays
)
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
eql
(
15
)
})
...
...
@@ -73,7 +77,7 @@ describe('getCycleDay', () => {
}]
const
targetDate
=
'
2018-04-27
'
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
}).
getCycleDayNumber
const
getCycleDayNumber
=
useBleedingDays
(
bleedingDays
)
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
eql
(
18
)
})
...
...
@@ -87,7 +91,7 @@ describe('getCycleDay', () => {
}]
const
targetDate
=
'
2018-05-13
'
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
}).
getCycleDayNumber
const
getCycleDayNumber
=
useBleedingDays
(
bleedingDays
)
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
eql
(
1
)
})
...
...
@@ -96,7 +100,7 @@ describe('getCycleDay', () => {
it
(
'
if there are no bleeding days
'
,
function
()
{
const
bleedingDays
=
[]
const
targetDate
=
'
2018-05-17
'
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
}).
getCycleDayNumber
const
getCycleDayNumber
=
useBleedingDays
(
bleedingDays
)
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
be
.
null
()
})
...
...
@@ -119,7 +123,10 @@ describe('getCycleDay', () => {
}]
const
targetDate
=
'
2018-05-17
'
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
,
maxBreakInBleeding
}).
getCycleDayNumber
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
,
maxBreakInBleeding
}).
getCycleDayNumber
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
eql
(
8
)
})
...
...
@@ -137,7 +144,10 @@ describe('getCycleDay', () => {
}
}]
const
targetDate
=
'
2018-05-17
'
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
,
maxBreakInBleeding
}).
getCycleDayNumber
const
getCycleDayNumber
=
cycleModule
({
bleedingDaysSortedByDate
:
bleedingDays
,
maxBreakInBleeding
}).
getCycleDayNumber
const
result
=
getCycleDayNumber
(
targetDate
)
expect
(
result
).
to
.
eql
(
4
)
})
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment