Fix self retain cycle in DatabaseView (#463)

* Fix self retain cycle in DatabaseView * Added Tests
auth0 · Sep 13, 2017 · 04087df · 04087df
1 parent 6c8b8ea
commit 04087df
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/Lock/DatabaseOnlyView.swift b/Lock/DatabaseOnlyView.swift
@@ -121,7 +121,7 @@ class DatabaseOnlyView: UIView, DatabaseView {
             self.passwordManagerButton = form.passwordField.addFieldButton(withIcon: "ic_onepassword", color: Style.Auth0.onePasswordIconColor)
         } else if showPassword, let passwordInput = form.passwordField.textField {
             self.showPasswordButton = form.passwordField.addFieldButton(withIcon: "ic_show_password_hidden", color: Style.Auth0.inputIconColor)
-            self.showPasswordButton?.onPress = { button in
+            self.showPasswordButton?.onPress = { [unowned self] button in
                 passwordInput.isSecureTextEntry = !passwordInput.isSecureTextEntry
                 button.icon = LazyImage(name: passwordInput.isSecureTextEntry ? "ic_show_password_hidden" : "ic_show_password_visible", bundle: Lock.bundle).image(compatibleWithTraits: self.traitCollection)
             }
@@ -171,7 +171,7 @@ class DatabaseOnlyView: UIView, DatabaseView {
             self.passwordManagerButton = form.passwordField.addFieldButton(withIcon: "ic_onepassword", color: Style.Auth0.onePasswordIconColor)
         } else if showPassword, let passwordInput = form.passwordField.textField {
             self.showPasswordButton = form.passwordField.addFieldButton(withIcon: "ic_show_password_hidden", color: Style.Auth0.inputIconColor)
-            self.showPasswordButton?.onPress = { button in
+            self.showPasswordButton?.onPress = { [unowned self] button in
                 passwordInput.isSecureTextEntry = !passwordInput.isSecureTextEntry
                 button.icon = LazyImage(name: passwordInput.isSecureTextEntry ? "ic_show_password_hidden" : "ic_show_password_visible", bundle: Lock.bundle).image(compatibleWithTraits: self.traitCollection)
             }

diff --git a/LockTests/Presenters/DatabasePresenterSpec.swift b/LockTests/Presenters/DatabasePresenterSpec.swift
@@ -221,6 +221,10 @@ class DatabasePresenterSpec: QuickSpec {
                 expect(view.passwordManagerButton).to(beNil())
             }
 
+            it("should have show password button") {
+                expect(view.showPasswordButton).toNot(beNil())
+            }
+
             context("with password manager available") {
 
                 beforeEach {
@@ -237,6 +241,10 @@ class DatabasePresenterSpec: QuickSpec {
                     view = presenter.view as! DatabaseOnlyView
                     expect(view.passwordManagerButton).to(beNil())
                 }
+
+                it("should not have show password button") {
+                    expect(view.showPasswordButton).to(beNil())
+                }
             }
 
             describe("user input") {
@@ -293,6 +301,12 @@ class DatabasePresenterSpec: QuickSpec {
                     expect(input.valid) == false
                 }
 
+                it("should toggle show password") {
+                    expect(view.passwordField?.textField?.isSecureTextEntry).to(beTrue())
+                    view.showPasswordButton?.onPress(view.showPasswordButton!)
+                    expect(view.passwordField?.textField?.isSecureTextEntry).to(beFalse())
+                }
+
             }
 
             // MARK:- Log In
@@ -445,6 +459,10 @@ class DatabasePresenterSpec: QuickSpec {
                 expect(view.primaryButton?.title) == "SIGN UP"
             }
 
+            it("should have show password button") {
+                expect(view.showPasswordButton).toNot(beNil())
+            }
+
             describe("user input") {
 
                 it("should clear global message") {
@@ -504,6 +522,10 @@ class DatabasePresenterSpec: QuickSpec {
                     expect(view.passwordManagerButton).to(beNil())
                 }
 
+                it("should not show password manager when disabled") {
+                    expect(view.passwordManagerButton).to(beNil())
+                }
+
                 context("with password manager available") {
 
                     beforeEach {
@@ -517,23 +539,17 @@ class DatabasePresenterSpec: QuickSpec {
                         expect(view.passwordManagerButton).toNot(beNil())
                     }
 
-                    context("disable password manager") {
-
-                        beforeEach {
-                            presenter.passwordManager = passwordManager
-                            presenter.passwordManager.enabled = false
-                            view = presenter.view as! DatabaseOnlyView
-                            view.switcher?.selected = .signup
-                            view.switcher?.onSelectionChange(view.switcher!)
-                        }
-
-                        it("should not show password manager when disabled") {
-                            expect(view.passwordManagerButton).to(beNil())
-                        }
-
+                    it("should not have show password button") {
+                        expect(view.showPasswordButton).to(beNil())
                     }
                 }
 
+                it("should toggle show password") {
+                    expect(view.passwordField?.textField?.isSecureTextEntry).to(beTrue())
+                    view.showPasswordButton?.onPress(view.showPasswordButton!)
+                    expect(view.passwordField?.textField?.isSecureTextEntry).to(beFalse())
+                }
+
             }
 
             describe("sign up action") {