Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

All Swift from the ingredient list view down #49

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/Tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Cake Tests
on: pull_request
jobs:
test:
runs-on: [macos-latest]
runs-on: [macos-13]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -43,6 +43,8 @@ jobs:

- name: Run Tests
run: |
sudo xcode-select -s /Applications/Xcode_15.1.app
xcrun swift --version
cd $GITHUB_WORKSPACE/CookSmart
fastlane testlane

20 changes: 10 additions & 10 deletions CookSmart/CakeTests/DoubleStringUtilsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,61 +40,61 @@ class DoubleSringUtilsTests: XCTestCase {

func test_vulgarFractionString_aboveThreshold_roundsUp() {
let rawValue = 66.7
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "67")
}

func test_vulgarFractionString_aboveThreshold_roundsDown() {
let rawValue = 66.445
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "66")
}

func test_vulgarFractionString_aboveThreshold() {
let rawValue = 66.445
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "66")
}

func test_vulgarFractionString_belowThreshold_half() {
let rawValue = 49.45
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "49½")
}

func test_vulgarFractionString_belowThreshold_zero() {
let rawValue = 0.05
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "0")
}

func test_vulgarFractionString_belowThreshold_eighth() {
let rawValue = 0.1
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "⅛")
}

func test_vulgarFractionString_belowThreshold_quarter() {
let rawValue = 1.20
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "1¼")
}

func test_vulgarFractionString_belowThreshold_third() {
let rawValue = 1.35
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "1⅓")
}

func test_vulgarFractionString_belowThreshold_one() {
let rawValue = 0.95
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "1")
}

func test_vulgarFractionString_belowThreshold_two() {
let rawValue = 1.95
let result = rawValue.vulgarFractionString
let result = rawValue.humanReabableString
XCTAssertEqual(result, "2")
}
}
252 changes: 123 additions & 129 deletions CookSmart/CookSmart.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

274 changes: 0 additions & 274 deletions CookSmart/CookSmart/CSConversionVC.m

This file was deleted.

17 changes: 0 additions & 17 deletions CookSmart/CookSmart/CSFilteredIngredientGroup.h

This file was deleted.

Loading
Loading