Skip to content

Commit

Permalink
Revert "wip: remove UT8-chars to see if windows issue"
Browse files Browse the repository at this point in the history
Pact standalone 1.33.1 contains UTF-8 encoding fix,
we can now enable those regressions.

This reverts commit ca1feaa.
  • Loading branch information
mefellows committed Mar 26, 2018
1 parent 4089f19 commit 92e3b83
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion examples/consumer/goconsumer/user_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var pact dsl.Pact
var form url.Values
var rr http.ResponseWriter
var req *http.Request
var name = "sally"
var name = "Jean-Marie de La Beaujardière😀😍"
var like = dsl.Like
var eachLike = dsl.EachLike
var term = dsl.Term
Expand Down
6 changes: 3 additions & 3 deletions examples/gin/provider/user_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ type Login struct {

var userRepository = &types.UserRepository{
Users: map[string]*types.User{
"sally": &types.User{
Name: "sally",
Username: "sally",
"Jean-Marie de La Beaujardière😀😍": &types.User{
Name: "Jean-Marie de La Beaujardière😀😍",
Username: "Jean-Marie de La Beaujardière😀😍",
Password: "issilly",
Type: "admin",
},
Expand Down
12 changes: 6 additions & 6 deletions examples/gin/provider/user_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ var port, _ = utils.GetFreePort()
// Provider States data sets
var billyExists = &examples.UserRepository{
Users: map[string]*examples.User{
"sally": &examples.User{
Name: "sally",
Username: "sally",
"Jean-Marie de La Beaujardière😀😍": &examples.User{
Name: "Jean-Marie de La Beaujardière😀😍",
Username: "Jean-Marie de La Beaujardière😀😍",
Password: "issilly",
Type: "admin",
},
Expand All @@ -116,9 +116,9 @@ var billyDoesNotExist = &examples.UserRepository{}

var billyUnauthorized = &examples.UserRepository{
Users: map[string]*examples.User{
"sally": &examples.User{
Name: "sally",
Username: "sally",
"Jean-Marie de La Beaujardière😀😍": &examples.User{
Name: "Jean-Marie de La Beaujardière😀😍",
Username: "Jean-Marie de La Beaujardière😀😍",
Password: "issilly1",
Type: "blocked",
},
Expand Down
6 changes: 3 additions & 3 deletions examples/go-kit/provider/user_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ func NewInmemService() Service {
return &userService{
userDatabase: &UserRepository{
users: map[string]*User{
"sally": &User{
Name: "sally",
username: "sally",
"Jean-Marie de La Beaujardière😀😍": &User{
Name: "Jean-Marie de La Beaujardière😀😍",
username: "Jean-Marie de La Beaujardière😀😍",
password: "issilly",
Type: "admin",
},
Expand Down
12 changes: 6 additions & 6 deletions examples/go-kit/provider/user_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ var port, _ = utils.GetFreePort()
// Provider States data sets
var billyExists = &UserRepository{
users: map[string]*User{
"sally": &User{
Name: "sally",
username: "sally",
"Jean-Marie de La Beaujardière😀😍": &User{
Name: "Jean-Marie de La Beaujardière😀😍",
username: "Jean-Marie de La Beaujardière😀😍",
password: "issilly",
Type: "admin",
},
Expand All @@ -42,9 +42,9 @@ var billyDoesNotExist = &UserRepository{}

var billyUnauthorized = &UserRepository{
users: map[string]*User{
"sally": &User{
Name: "sally",
username: "sally",
"Jean-Marie de La Beaujardière😀😍": &User{
Name: "Jean-Marie de La Beaujardière😀😍",
username: "Jean-Marie de La Beaujardière😀😍",
password: "issilly1",
Type: "blocked",
},
Expand Down
4 changes: 2 additions & 2 deletions examples/mux/provider/user_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
var userRepository = &types.UserRepository{
Users: map[string]*types.User{
"billy": &types.User{
Name: "sally",
Username: "sally",
Name: "Jean-Marie de La Beaujardière😀😍",
Username: "Jean-Marie de La Beaujardière😀😍",
Password: "issilly",
},
},
Expand Down
12 changes: 6 additions & 6 deletions examples/mux/provider/user_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ var port, _ = utils.GetFreePort()
// Provider States data sets
var billyExists = &examples.UserRepository{
Users: map[string]*examples.User{
"sally": &examples.User{
Name: "sally",
Username: "sally",
"Jean-Marie de La Beaujardière😀😍": &examples.User{
Name: "Jean-Marie de La Beaujardière😀😍",
Username: "Jean-Marie de La Beaujardière😀😍",
Password: "issilly",
Type: "admin",
},
Expand All @@ -142,9 +142,9 @@ var billyDoesNotExist = &examples.UserRepository{}

var billyUnauthorized = &examples.UserRepository{
Users: map[string]*examples.User{
"sally": &examples.User{
Name: "sally",
Username: "sally",
"Jean-Marie de La Beaujardière😀😍": &examples.User{
Name: "Jean-Marie de La Beaujardière😀😍",
Username: "Jean-Marie de La Beaujardière😀😍",
Password: "issilly1",
Type: "blocked",
},
Expand Down
2 changes: 1 addition & 1 deletion scripts/pact.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ New-Item -Force -ItemType Directory $pactDir

Write-Host "--> Downloading Ruby binaries)"
$downloadDir = $env:TEMP
$url = "https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.32.0/pact-1.32.0-win32.zip"
$url = "https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.33.1/pact-1.33.1-win32.zip"

Write-Host " Downloading $url"
$zip = "$downloadDir\pact.zip"
Expand Down

0 comments on commit 92e3b83

Please sign in to comment.