Skip to content

Commit

Permalink
Merge branch 'main' into reorganize-files
Browse files Browse the repository at this point in the history
# Conflicts:
#	Sources/Layout/UIKit/UIView+NSLayoutAnchor.swift
#	Sources/Layout/UIView+LayoutAnchor.swift
#	Sources/Layout/UIView+NSLayoutAnchor.swift
#	Tests/LayoutTests/LayoutAnchoringTests.swift
#	Tests/LayoutTests/UIKit/UIView+FramesTests.swift
#	Tests/LayoutTests/UIKit/UIView+NSLayoutAnchorTests.swift
#	Tests/LayoutTests/UIKit/UIViewControllerTests.swift
#	Tests/LayoutTests/UIView+LayoutAnchorTests.swift
#	Tests/LayoutTests/UIView+NSLayoutAnchorTests.swift
#	Tests/LayoutTests/UIViewControllerTests.swift
  • Loading branch information
tinder-emanharoutunian committed Dec 7, 2023
2 parents 387b631 + d69d19f commit 95ece5e
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions Tests/LayoutTests/UIKit/UIView+FramesTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ final class UIViewFramesTests: XCTestCase {

// GIVEN

let view: UIView = givenView()
let view: UIView = .init()
view.translatesAutoresizingMaskIntoConstraints = false

// WHEN

Expand All @@ -33,7 +34,7 @@ final class UIViewFramesTests: XCTestCase {

// GIVEN

let view: UIView = givenView()
let view: UIView = .init()

// THEN

Expand All @@ -53,11 +54,4 @@ final class UIViewFramesTests: XCTestCase {
expect(view.contentCompressionResistancePriority(for: .horizontal)) == .disabled
expect(view.contentCompressionResistancePriority(for: .vertical)) == .disabled
}

private func givenView() -> UIView {
let view: UIView = .init()
view.autoresizingMask = []
view.translatesAutoresizingMaskIntoConstraints = false
return view
}
}

0 comments on commit 95ece5e

Please sign in to comment.