Merge branch 'release/1.2_45'

PowZone · Jan 2, 2015 · 01c8acc · 01c8acc
2 parents 688d397 + c2fddbd
commit 01c8acc
Show file tree

Hide file tree

Showing 552 changed files with 25,460 additions and 17,488 deletions.
diff --git a/BeMyEyes Tests/BeMyEyes Tests-Bridging-Header.h b/BeMyEyes Tests/BeMyEyes Tests-Bridging-Header.h
@@ -17,3 +17,4 @@
 
 #import "BMEHelperMainViewController.h"
 #import "BMEBlindMainViewController.h"
+#import "BMEFrontPageViewController.h"
diff --git a/BeMyEyes Tests/BlindMainViewController_Tests.swift b/BeMyEyes Tests/BlindMainViewController_Tests.swift
@@ -16,6 +16,7 @@ class BlindMainViewController_Tests: FBSnapshotTestCase {
  override func setUp() {
  super.setUp()
 // recordMode = true
+ renderAsLayer = true
 
  helperVC = UIApplication.sharedApplication().keyWindow?.rootViewController?.storyboard?.instantiateViewControllerWithIdentifier(BMEMainBlindControllerIdentifier) as? BMEBlindMainViewController
  helperVC?.viewDidLoad()
@@ -26,7 +27,7 @@ class BlindMainViewController_Tests: FBSnapshotTestCase {
  }
 
  func testOnAllDevices() {
- verifyViewOnAllDevices(helperVC!.view)
+ verifyViewOnAllDevicesAndLanguages(helperVC!)
  }
 
  func testCreatePromoScreenshots() {

diff --git a/BeMyEyes Tests/FrontPageViewController_Tests.swift b/BeMyEyes Tests/FrontPageViewController_Tests.swift
@@ -0,0 +1,32 @@
+//
+// FrontPageViewController_Tests.swift
+// BeMyEyes
+//
+// Created by Tobias Due Munk on 02/01/15.
+// Copyright (c) 2015 Be My Eyes. All rights reserved.
+//
+
+import UIKit
+import XCTest
+
+class FrontPageViewController_Tests: FBSnapshotTestCase {
+
+ var frontPageVC: BMEFrontPageViewController?
+
+ override func setUp() {
+ super.setUp()
+ recordMode = true
+ renderAsLayer = true
+
+ frontPageVC = UIApplication.sharedApplication().keyWindow?.rootViewController?.storyboard?.instantiateViewControllerWithIdentifier(BMEFrontPageControllerIdentifier) as? BMEFrontPageViewController
+ frontPageVC?.viewDidLoad()
+ }
+
+ override func tearDown() {
+ super.tearDown()
+ }
+
+ func testOnAllDevices() {
+ verifyViewOnAllDevicesAndLanguages(frontPageVC!)
+ }
+}
diff --git a/BeMyEyes Tests/HelperMainViewController_Tests.swift b/BeMyEyes Tests/HelperMainViewController_Tests.swift
@@ -16,6 +16,7 @@ class HelperMainViewController_Tests: FBSnapshotTestCase {
  override func setUp() {
  super.setUp()
 // recordMode = true
+ renderAsLayer = true
 
  helperVC = UIApplication.sharedApplication().keyWindow?.rootViewController?.storyboard?.instantiateViewControllerWithIdentifier(BMEMainHelperControllerIdentifier) as? BMEHelperMainViewController
  helperVC?.viewDidLoad()
@@ -30,7 +31,7 @@ class HelperMainViewController_Tests: FBSnapshotTestCase {
  helperVC.user = BMEUser.idealUser()
  helperVC.stats = BMECommunityStats.idealStats()
  }
- verifyViewOnAllDevices(helperVC!.view)
+ verifyViewOnAllDevicesAndLanguages(helperVC!)
  }
 
  func testCreatePromoScreenshots() {