Skip to content
This repository has been archived by the owner on Jan 4, 2023. It is now read-only.

@orta => Fixes many things #408

Merged
merged 7 commits into from Mar 31, 2015
Merged

@orta => Fixes many things #408

merged 7 commits into from Mar 31, 2015

Conversation

ashfurrow
Copy link
Contributor

Removes unnecessary view controllers from storyboard

If you looked at the storyboard, there were two other VCs containing the starting VC.

screen shot 2015-03-30 at 5 32 53 pm

Removes unused function

It's a function we were never using, and it was generating a warning due to it being public, so I removed it.

Fixes storyboard warnings

Lots of warnings like this:

screen shot 2015-03-30 at 5 35 07 pm

Fixes intermittently failing tests

This was caused by SDWebImage caching images after the first tests were run. So the first tests passed because SDWebImage was actually trying to fetch images, but it wouldn't return them in time to set the images. It would then cache them to disk, so the next time you ran the tests, SDWebImage was able to use the on-disk cache.

So we use DI to avoid SDWebImage in tests.

Fixes WiFi name for testing at Artsy HQ

New wifi SSID means an update to our code.

Removes uses of println

Fixes #397.

@ashfurrow
Copy link
Contributor Author

Currently broken; gonna amend the last commit to not be broken tomorrow.

@orta
Copy link
Contributor

orta commented Mar 30, 2015

Cool

@ashfurrow ashfurrow changed the title [WIP] @orta => Fixes many things @orta => Fixes many things Mar 31, 2015
@ashfurrow
Copy link
Contributor Author

@orta this is ready for review 👾

@@ -169,7 +171,7 @@ public class ListingsViewController: UIViewController {
developmentEnvironment = true
#else
if let ssid = getSSID() {
let developmentSSIDs = ["Ash's Wi-Fi Network", "Art.sy", "Artsy2"] as NSArray
let developmentSSIDs = ["Artsy"] as NSArray
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Artsy 2 is still useful for 27

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I didn't realize that SSID was still in use.

@ashfurrow
Copy link
Contributor Author

screen shot 2015-03-31 at 3 49 44 pm

@ashfurrow
Copy link
Contributor Author

I'm getting to be something of a gunslinger when it comes to interactive rebases.

@orta
Copy link
Contributor

orta commented Mar 31, 2015

OK, looks good on a 2nd run through.

orta added a commit that referenced this pull request Mar 31, 2015
@orta orta merged commit 7fcb1ab into master Mar 31, 2015
@ashfurrow ashfurrow deleted the fixes branch April 30, 2015 15:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Lots of println
2 participants