Skip to content

Commit

Permalink
good for now
Browse files Browse the repository at this point in the history
  • Loading branch information
kfrancis committed Nov 3, 2021
1 parent 68f12c3 commit 315eb39
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 54 deletions.
79 changes: 39 additions & 40 deletions .github/workflows/nuget_publish.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
#name: Build and NuGet Publish

#on:
# push:
# branches: [ master ]
# pull_request:
# branches: [ master ]

#jobs:
# build-test:
# name: Build and Publish
# runs-on: ubuntu-latest

# steps:
# - name: Checkout Repository
# uses: actions/checkout@v2
# with:
# fetch-depth: 0 # avoid shallow clone so nbgv can do its work.

# - name: Setup .NET
# uses: actions/setup-dotnet@v1
# with:
# dotnet-version: 5.0.x

# - uses: dotnet/nbgv@master
# with:
# setAllVars: true

# - name: Restore dependencies
# run: dotnet restore

# - name: Build
# run: dotnet build --no-restore /nowarn:CS1591

# - name: Publish
# run: | # | character makes the "run" property multi-line, so we can put multiple commands in the same step
# mkdir __out
# dotnet pack -c Release -o ${GITHUB_WORKSPACE}/packages --no-restore -p:RepositoryBranch=main -p:ContinuousIntegrationBuild=true /p:PublicRelease=true
# dotnet nuget push ${GITHUB_WORKSPACE}/packages/'*.nupkg' -s https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET_KEY}}

name: Build and NuGet Publish

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:
build-test:
name: Build and Publish
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v2
with:
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.

- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x

- uses: dotnet/nbgv@master
with:
setAllVars: true

- name: Restore dependencies
run: dotnet restore

- name: Build
run: dotnet build --no-restore /nowarn:CS1591

- name: Publish
run: | # | character makes the "run" property multi-line, so we can put multiple commands in the same step
mkdir __out
dotnet pack -c Release -o ${GITHUB_WORKSPACE}/packages --no-restore -p:RepositoryBranch=main -p:ContinuousIntegrationBuild=true /p:PublicRelease=true
dotnet nuget push ${GITHUB_WORKSPACE}/packages/'*.nupkg' -s https://api.nuget.org/v3/index.json --skip-duplicate --no-symbols true --api-key ${{secrets.NUGET_KEY}}
11 changes: 6 additions & 5 deletions Source/ChargifyDotNet.Tests/Base/ChargifyTestBase.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using ChargifyNET;
using System.Net;
using Bogus;
Expand All @@ -14,15 +14,15 @@ public class ChargifyTestBase
///</summary>
public TestContext TestContext { get; set; }

public ChargifyConnect Chargify => _chargify ?? (_chargify = new ChargifyConnect
public ChargifyConnect Chargify => _chargify ??= new ChargifyConnect
{
apiKey = "",
Password = "X",
URL = "https://subdomain.chargify.com/",
SharedKey = "123456789",
UseJSON = false,
ProtocolType = SecurityProtocolType.Tls12
});
};

private ChargifyConnect _chargify;

Expand Down Expand Up @@ -77,11 +77,12 @@ public string GetNewRandomValue(string oldValue, Func<string, string> generateVa
return retVal;
}

public static Faker Faker => new Faker("en");
public static Faker Faker => new("en");

internal void SetJson(bool useJson)
{
if (Chargify != null) {
if (Chargify != null)
{
_chargify.UseJSON = useJson;
}
}
Expand Down
27 changes: 18 additions & 9 deletions Source/ChargifyDotNet.Tests/ComponentTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void PricePoints_Create(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand Down Expand Up @@ -286,7 +286,7 @@ public void PricePoints_PromoteToDefault(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand All @@ -313,7 +313,7 @@ public void PricePoints_CreateBulk(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand All @@ -331,7 +331,7 @@ public void PricePoints_Update(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand All @@ -348,7 +348,7 @@ public void PricePoints_Archive(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand Down Expand Up @@ -376,7 +376,7 @@ public void PricePoints_Read(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand All @@ -400,7 +400,7 @@ public void PricePoints_Unarchive(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand Down Expand Up @@ -428,10 +428,19 @@ public void PricePoints_UpdatePrices(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

var pricePoints = Chargify.GetPricePoints(subscriptionComponent.ComponentID)?.Values.ToList();
var firstPricePoint = pricePoints.FirstOrDefault();
if (firstPricePoint == null) Assert.Inconclusive();

var firstPrice = firstPricePoint.Prices.FirstOrDefault();
firstPrice.UnitPrice += 1;

//Chargify.UpdatePriceInPricePoint(subscriptionComponent.ComponentID, firstPrice);

SetJson(!isJson);
}

Expand All @@ -445,7 +454,7 @@ public void PricePoints_CreatePrices(string method)
SetJson(isJson);

// Arrange
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active).Value;
var subscription = Chargify.GetSubscriptionList().FirstOrDefault(s => s.Value.State == SubscriptionState.Active && s.Value.Product.ID == 5830949).Value;
if (subscription == null) Assert.Inconclusive("A valid subscription could not be found.");
var subscriptionComponent = Chargify.GetComponentInfoForSubscription(subscription.SubscriptionID, 1526150);

Expand Down

0 comments on commit 315eb39

Please sign in to comment.