Merge pull request #81 from wayfair/80-generic-brick-clear-color

Moved place where generic brick background color is set to clear
wayfair-archive · Feb 13, 2017 · affa796 · affa796
2 parents 4e2bcaa + 61cc15d
commit affa796
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/Source/Bricks/Generic/GenericBrick.swift b/Source/Bricks/Generic/GenericBrick.swift
@@ -39,6 +39,8 @@ public class GenericBrick<T: UIView>: Brick, ViewGenerator {
     public func generateView(frame: CGRect, in cell: GenericBrickCell) -> UIView {
         let view = T(frame: frame)
 
+        view.backgroundColor = .clearColor()
+
         self.configureView(view: view, cell: cell)
 
         return view
@@ -66,6 +68,9 @@ public class GenericBrickCell: BrickCell {
 
         clearContentViewAndConstraints()
 
+        backgroundColor = .clearColor()
+        contentView.backgroundColor = .clearColor()
+
         if let generic = self._brick as? ViewGenerator {
             let genericContentView = generic.generateView(self.frame, in: self)
             genericContentView.translatesAutoresizingMaskIntoConstraints = false
@@ -88,10 +93,6 @@ public class GenericBrickCell: BrickCell {
             self.rightSpaceConstraint = rightSpaceConstraint
         }
 
-        backgroundColor = .clearColor()
-        contentView.backgroundColor = .clearColor()
-        genericContentView?.backgroundColor = .clearColor()
-
     }
 
     private func clearContentViewAndConstraints() {

diff --git a/Tests/Bricks/GenericBrickTests.swift b/Tests/Bricks/GenericBrickTests.swift
@@ -105,4 +105,16 @@ class GenericBrickTests: XCTestCase {
         XCTAssertEqual(label4.text, "LABEL 4")
     }
 
+    func testThatBackgroundColorIsNotReset() {
+        brickCollectionView.setupSingleBrickAndLayout(GenericBrick<UILabel>(GenericLabelBrickIdentifier, width: .Ratio(ratio: 1), height: .Fixed(size: 50), backgroundColor: .orangeColor()) { label, view in
+            label.backgroundColor = .redColor()
+            })
+
+        let cell: GenericBrickCell? = firstCellForIdentifier(GenericLabelBrickIdentifier)
+
+        XCTAssertEqual(cell?.genericContentView?.backgroundColor, UIColor.redColor())
+        XCTAssertEqual(cell?.contentView.backgroundColor, UIColor.orangeColor())
+    }
+
+
 }