From 71d74ea227c82d2648db76cfa1c3cb5a6c035759 Mon Sep 17 00:00:00 2001 From: Valerio Mazzeo Date: Tue, 11 Aug 2020 12:11:02 +0100 Subject: [PATCH 1/2] * Re-enabled schema test * Updated to MongoSwift 1.0.1 --- Package.swift | 4 ++-- Tests/FluentMongoTests/FluentBenchmarkTests.swift | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index d7a0dd6..562b68d 100644 --- a/Package.swift +++ b/Package.swift @@ -19,8 +19,8 @@ let package = Package( .library(name: "FluentMongo", targets: ["FluentMongo"]) ], dependencies: [ - .package(url: "https://github.com/vapor/fluent-kit.git", .upToNextMajor(from: "1.6.0")), - .package(url: "https://github.com/mongodb/mongo-swift-driver.git", .upToNextMajor(from: "1.0.0")) + .package(url: "https://github.com/vapor/fluent-kit.git", .upToNextMajor(from: "1.7.1")), + .package(url: "https://github.com/mongodb/mongo-swift-driver.git", .upToNextMajor(from: "1.0.1")) ], targets: [ .target(name: "FluentMongo", dependencies: [ diff --git a/Tests/FluentMongoTests/FluentBenchmarkTests.swift b/Tests/FluentMongoTests/FluentBenchmarkTests.swift index bb48fee..2056469 100644 --- a/Tests/FluentMongoTests/FluentBenchmarkTests.swift +++ b/Tests/FluentMongoTests/FluentBenchmarkTests.swift @@ -73,8 +73,7 @@ final class FluentBenchmarkTests: XCTestCase { func testParent() throws { try self.benchmarker.testParent() } func testPerformance() throws { try self.benchmarker.testPerformance(decimalType: .dictionary) } func testRange() throws { try self.benchmarker.testRange() } - // Disabled until https://github.com/vapor/fluent-kit/pull/368 - //func testSchema() throws { try self.benchmarker.testSchema() } + func testSchema() throws { try self.benchmarker.testSchema(foreignKeys: false) } func testSet() throws { try self.benchmarker.testSet() } func testSiblings() throws { try self.benchmarker.testSiblings() } func testSoftDelete() throws { try self.benchmarker.testSoftDelete() } From c1082cd77a8d67aeeed8d0bd59a4003c0de8c350 Mon Sep 17 00:00:00 2001 From: Valerio Mazzeo Date: Tue, 11 Aug 2020 12:22:44 +0100 Subject: [PATCH 2/2] updated travis.yml --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22d551d..914ad22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ language: generic before_install: - export SWIFT_VERSION=$(<.swift-version) - export SWIFT_DOCKER_IMAGE=swift:${SWIFT_VERSION}-bionic - - export MONGO_DOCKER_IMAGE=mongo:4.2 - - export MONGO_BREW_VERSION=mongodb-community@4.2 + - export MONGO_DOCKER_IMAGE=mongo:4.4 + - export MONGO_BREW_VERSION=mongodb-community@4.4 stages: - name: test @@ -32,7 +32,7 @@ jobs: - stage: test name: Unit Tests os: osx - osx_image: xcode11.5 + osx_image: xcode11.6 before_script: - gem install bundler - bundle install