fix mistakes in freckle-http tests (#229)

freckle · Feb 12, 2025 · 5b8730f · 5b8730f
1 parent cb23694
commit 5b8730f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/freckle-app/CHANGELOG.md b/freckle-app/CHANGELOG.md
@@ -1,4 +1,8 @@
-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.22.0.0...main)
+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.23.0.0...main)
+
+## [v1.23.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.22.0.0...freckle-app-v1.23.0.0)
+
+Removes `Freckle.App.HttpSpec` which had been included by mistake.
 
 ## [v1.22.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.21.0.0...freckle-app-v1.22.0.0)
 

diff --git a/freckle-app/freckle-app.cabal b/freckle-app/freckle-app.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.22
 -- see: https://github.com/sol/hpack
 
 name:           freckle-app
-version:        1.22.0.0
+version:        1.23.0.0
 synopsis:       Haskell application toolkit used at Freckle
 description:    Please see README.md
 category:       Utils
@@ -69,7 +69,6 @@ library
     , Freckle.App.Http.Header
     , Freckle.App.Http.Paginate
     , Freckle.App.Http.Retry
-    , Freckle.App.HttpSpec
     , Freckle.App.Prelude
     , Freckle.App.Exception
     , Freckle.App.Exception.MonadThrow
@@ -203,7 +202,6 @@ test-suite spec
       Freckle.App.BugsnagSpec
       Freckle.App.CsvSpec
       Freckle.App.Test.Hspec.AnnotatedExceptionSpec
-      Freckle.App.Test.Http.MatchRequestSpec
       Freckle.App.Test.Properties.JSONSpec
       Freckle.App.Test.Properties.PathPieceSpec
       Freckle.App.Test.Properties.PersistValueSpec

diff --git a/freckle-app/package.yaml b/freckle-app/package.yaml
@@ -1,5 +1,5 @@
 name: freckle-app
-version: 1.22.0.0
+version: 1.23.0.0
 
 maintainer: Freckle Education
 category: Utils
@@ -66,7 +66,6 @@ library:
     - Freckle.App.Http.Header
     - Freckle.App.Http.Paginate
     - Freckle.App.Http.Retry
-    - Freckle.App.HttpSpec
     - Freckle.App.Prelude
     - Freckle.App.Exception
     - Freckle.App.Exception.MonadThrow

diff --git a/freckle-http/CHANGELOG.md b/freckle-http/CHANGELOG.md
@@ -1,4 +1,8 @@
-## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-http-v0.0.0.0...main)
+## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-http-v0.1.0.0...main)
+
+## [v0.1.0.0](https://github.com/freckle/freckle-app/compare/freckle-http-v0.0.0.0...freckle-http-v0.1.0.0)
+
+Removes `Freckle.App.HttpSpec` which had been included by mistake.
 
 ## [v0.0.0.0](https://github.com/freckle/freckle-app/tree/freckle-http-v0.0.0.0/freckle-http)
 

diff --git a/freckle-http/freckle-http.cabal b/freckle-http/freckle-http.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.18
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.37.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           freckle-http
-version:        0.0.0.0
+version:        0.1.0.0
 synopsis:       Toolkit for making HTTP requests
 description:    Please see README.md
 category:       HTTP
@@ -35,7 +35,6 @@ library
       Freckle.App.Http.Header
       Freckle.App.Http.Paginate
       Freckle.App.Http.Retry
-      Freckle.App.HttpSpec
       Freckle.App.Test.Http
       Freckle.App.Test.Http.MatchRequest
   other-modules:
@@ -72,13 +71,11 @@ library
     , filepath
     , freckle-memcached
     , hs-opentelemetry-api
-    , hspec >=2.8.1
     , http-client
     , http-conduit >=2.3.5
     , http-link-header
     , http-types
     , lens
-    , lens-aeson
     , memcache
     , monad-logger
     , monad-validate
@@ -102,6 +99,8 @@ test-suite spec
   main-is: Main.hs
   other-modules:
       Freckle.App.Http.CacheSpec
+      Freckle.App.HttpSpec
+      Freckle.App.Test.Http.MatchRequestSpec
       Paths_freckle_http
   hs-source-dirs:
       tests
@@ -125,11 +124,13 @@ test-suite spec
     , base <5
     , bytestring
     , freckle-http
-    , hspec
+    , freckle-prelude
+    , hspec >=2.8.1
     , hspec-expectations-json
     , hspec-expectations-lifted
     , http-types
     , lens
+    , lens-aeson
     , mtl
     , time
     , unordered-containers

diff --git a/freckle-http/package.yaml b/freckle-http/package.yaml
@@ -1,5 +1,5 @@
 name: freckle-http
-version: 0.0.0.0
+version: 0.1.0.0
 maintainer: Freckle Education
 category: HTTP
 github: freckle/freckle-app
@@ -70,13 +70,11 @@ library:
     - filepath
     - freckle-memcached
     - hs-opentelemetry-api
-    - hspec >= 2.8.1
     - http-client
     - http-conduit >= 2.3.5 # addToRequestQueryString
     - http-link-header
     - http-types
     - lens
-    - lens-aeson
     - memcache
     - monad-logger
     - monad-validate
@@ -101,11 +99,13 @@ tests:
       - aeson
       - bytestring
       - freckle-http
-      - hspec
+      - freckle-prelude
+      - hspec >= 2.8.1
       - hspec-expectations-json
       - hspec-expectations-lifted
       - http-types
       - lens
+      - lens-aeson
       - mtl
       - time
       - unordered-containers

diff --git a/freckle-http/library/Freckle/App/HttpSpec.hs → freckle-http/tests/Freckle/App/HttpSpec.hs b/freckle-http/library/Freckle/App/HttpSpec.hs → freckle-http/tests/Freckle/App/HttpSpec.hs
diff --git a/...Freckle/App/Test/Http/MatchRequestSpec.hs → ...Freckle/App/Test/Http/MatchRequestSpec.hs b/...Freckle/App/Test/Http/MatchRequestSpec.hs → ...Freckle/App/Test/Http/MatchRequestSpec.hs