This repository has been archived by the owner on Sep 20, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 386
Fix for "Mentioned issues are not sorted by date" #2663
Open
akarataev
wants to merge
1
commit into
GitHawkApp:master
Choose a base branch
from
akarataev:2649-mentioned-sorted-by-date
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// | ||
// SortingMentionedByDayTests.swift | ||
// FreetimeTests | ||
// | ||
// Created by Alexey Karataev on 09.03.2019. | ||
// Copyright © 2019 Ryan Nystrom. All rights reserved. | ||
// | ||
|
||
import XCTest | ||
@testable import Freetime | ||
@testable import StyledTextKit | ||
@testable import GitHubAPI | ||
|
||
class SortingMentionedByDayTests: XCTestCase { | ||
func testSortingMentionedByDay() { | ||
// MARK: - given | ||
let models = 5 | ||
let parsed = InboxDashboardModelBuilder.provide(number: models) | ||
let mentioned = V3IssuesRequest.FilterType.mentioned | ||
let created = V3IssuesRequest.FilterType.created | ||
let assigned = V3IssuesRequest.FilterType.assigned | ||
// MARK: - when | ||
let mentionedSorted = parsed.sortedMentionedByDate(filter: mentioned) | ||
let createdSorted = parsed.sortedMentionedByDate(filter: created) | ||
let assignedSorted = parsed.sortedMentionedByDate(filter: assigned) | ||
// MARK: - then | ||
XCTAssert(zip(mentionedSorted, | ||
parsed.sorted(by: {$0.date > $1.date})) | ||
.allSatisfy { $0.date == $1.date }, "Mentioned is not sorted by day") | ||
XCTAssert(zip(createdSorted, parsed) | ||
.allSatisfy { $0.date == $1.date }, "Sorting affect created feed") | ||
XCTAssert(zip(assignedSorted, parsed) | ||
.allSatisfy { $0.date == $1.date }, "Sorting affect assigned feed") | ||
} | ||
} | ||
|
||
class InboxDashboardModelBuilder { | ||
let model: InboxDashboardModel | ||
private init(date: Date) { | ||
self.model = InboxDashboardModel(owner: "", name: "", number: 0, date: date, | ||
text: StyledTextRenderer(string: StyledTextString(styledTexts: []), | ||
contentSizeCategory: UIContentSizeCategory(rawValue: "")), | ||
isPullRequest: false, state: .open | ||
) | ||
} | ||
static func provide(number: Int, with interval: TimeInterval = TimeInterval(86400)) -> [InboxDashboardModel] { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Neat :) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
return (1...number).map { InboxDashboardModelBuilder(date: Date() + interval * Double($0)).model } | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would also be 💯 if we can add a test for this one!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added tests for this functionality.