Skip to content

Commit b09c665

Browse files
ckoegelckoegel
authored
SWI-5429 Update Test Suite and Workflows (#137)
* SWI-5429 Update Test Suite and Workflows * remove integration from test names
1 parent 8375228 commit b09c665

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+98
-111
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Install Packages and Test
5757
run: |
5858
bundle install
59-
rake
59+
rake unit
6060
6161
- name: Deploy to Rubygems
6262
run: |

‎.github/workflows/test-nightly.yml‎

Lines changed: 50 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,61 @@
1-
name: Test Main Branch Nightly
1+
name: Nightly Smoke Tests
22

33
on:
4-
schedule:
5-
- cron: "0 4 * * *"
4+
schedule:
5+
- cron: "0 4 * * *"
66

77
concurrency:
8-
group: ${{ github.workflow }}-${{ github.head_ref }}
9-
cancel-in-progress: true
8+
group: ${{ github.workflow }}-${{ github.head_ref }}
9+
cancel-in-progress: true
1010

1111
env:
12-
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
13-
BW_USERNAME: ${{ secrets.BW_USERNAME }}
14-
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
15-
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
16-
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
17-
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
18-
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
19-
BW_NUMBER: ${{ secrets.BW_NUMBER }}
20-
USER_NUMBER: ${{ secrets.USER_NUMBER }}
21-
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
22-
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
23-
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
24-
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
25-
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
12+
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
13+
BW_USERNAME: ${{ secrets.BW_USERNAME }}
14+
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
15+
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
16+
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
17+
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
18+
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
19+
BW_NUMBER: ${{ secrets.BW_NUMBER }}
20+
USER_NUMBER: ${{ secrets.USER_NUMBER }}
21+
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
22+
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
23+
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
24+
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
25+
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
2626

2727
jobs:
28-
test_main:
29-
name: Test Main Branch Nightly
30-
runs-on: ${{ matrix.os }}
31-
strategy:
32-
matrix:
33-
os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
34-
ruby-version: [2.7, 3.0, 3.1, 3.2, 3.3]
35-
fail-fast: false
36-
steps:
37-
- name: Checkout
38-
uses: actions/checkout@v4
39-
with:
40-
ref: "main"
28+
test_main:
29+
name: Nightly Smoke Test
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Checkout
33+
uses: actions/checkout@v4
34+
with:
35+
ref: "main"
4136

42-
- name: Set up Ruby
43-
uses: ruby/setup-ruby@v1
44-
with:
45-
ruby-version: ${{ matrix.ruby-version }}
37+
- name: Set up Ruby
38+
uses: ruby/setup-ruby@v1
39+
with:
40+
ruby-version: 3.2
4641

47-
- name: Install Packages and Test
48-
run: |
49-
bundle install
50-
rake
51-
env:
52-
RUBY_VERSION: ${{ matrix.ruby-version }}
53-
OPERATING_SYSTEM: ${{ matrix.os }}
42+
- name: Install Packages and Test
43+
run: |
44+
bundle install
45+
rake smoke
46+
env:
47+
RUBY_VERSION: 3.2
48+
OPERATING_SYSTEM: ubuntu
5449

55-
notify_for_failures:
56-
name: Notify for Failures
57-
needs: [test_main]
58-
if: failure()
59-
runs-on: ubuntu-latest
60-
steps:
61-
- name: Notify Slack of Failures
62-
uses: Bandwidth/[email protected]
63-
with:
64-
job-status: failure
65-
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
66-
slack-channel: ${{ secrets.SLACK_CHANNEL }}
50+
notify_for_failures:
51+
name: Notify for Failures
52+
needs: [test_main]
53+
if: failure()
54+
runs-on: ubuntu-latest
55+
steps:
56+
- name: Notify Slack of Failures
57+
uses: Bandwidth/[email protected]
58+
with:
59+
job-status: failure
60+
slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
61+
slack-channel: ${{ secrets.SLACK_CHANNEL }}

‎.github/workflows/test-pr.yml‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
name: Test PR
22

33
on:
4-
pull_request:
5-
branches:
6-
- main
4+
pull_request:
5+
branches:
6+
- main
77

88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.head_ref }}
10-
cancel-in-progress: true
9+
group: ${{ github.workflow }}-${{ github.head_ref }}
10+
cancel-in-progress: true
1111

1212
env:
13-
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
14-
BW_USERNAME: ${{ secrets.BW_USERNAME }}
15-
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
16-
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
17-
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
18-
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
19-
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
20-
BW_NUMBER: ${{ secrets.BW_NUMBER }}
21-
USER_NUMBER: ${{ secrets.USER_NUMBER }}
22-
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
23-
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
24-
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
25-
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
26-
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
13+
BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
14+
BW_USERNAME: ${{ secrets.BW_USERNAME }}
15+
BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
16+
BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
17+
BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
18+
BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
19+
BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
20+
BW_NUMBER: ${{ secrets.BW_NUMBER }}
21+
USER_NUMBER: ${{ secrets.USER_NUMBER }}
22+
BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
23+
MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
24+
MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
25+
MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
26+
MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
2727

2828
jobs:
29-
test_pr:
30-
name: Test PR
31-
runs-on: ${{ matrix.os }}
32-
strategy:
33-
matrix:
34-
os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
35-
ruby-version: [2.7, 3.0, 3.1, 3.2, 3.3]
36-
fail-fast: false
37-
steps:
38-
- name: Checkout
39-
uses: actions/checkout@v4
29+
test_pr:
30+
name: Test PR
31+
runs-on: ${{ matrix.os }}
32+
strategy:
33+
matrix:
34+
os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
35+
ruby-version: [2.7, 3.0, 3.1, 3.2, 3.3]
36+
fail-fast: false
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@v4
4040

41-
- name: Set up Ruby
42-
uses: ruby/setup-ruby@v1
43-
with:
44-
ruby-version: ${{ matrix.ruby-version }}
41+
- name: Set up Ruby
42+
uses: ruby/setup-ruby@v1
43+
with:
44+
ruby-version: ${{ matrix.ruby-version }}
4545

46-
- name: Install Packages and Test
47-
run: |
48-
bundle install
49-
rake
50-
env:
51-
RUBY_VERSION: ${{ matrix.ruby-version }}
52-
OPERATING_SYSTEM: ${{ matrix.os }}
46+
- name: Install Packages and Test
47+
run: |
48+
bundle install
49+
rake unit
50+
env:
51+
RUBY_VERSION: ${{ matrix.ruby-version }}
52+
OPERATING_SYSTEM: ${{ matrix.os }}

‎Rakefile‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,12 @@ begin
88

99
desc 'Run Only Unit Tests'
1010
RSpec::Core::RakeTask.new(:unit) do |t|
11-
t.pattern = './spec/api/**/*_spec.rb'
12-
end
13-
RSpec::Core::RakeTask.new(:unit) do |t|
14-
t.pattern = './spec/models/**/*_spec.rb'
15-
end
16-
17-
desc 'Run Only Integration Tests'
18-
RSpec::Core::RakeTask.new(:integration) do |t|
19-
t.pattern = './spec/integration/*_spec.rb'
11+
t.pattern = './spec/unit/**/*_spec.rb'
2012
end
2113

22-
desc 'Run Only Client Unit Tests'
23-
RSpec::Core::RakeTask.new(:client) do |t|
24-
t.pattern = './spec/*_spec.rb'
14+
desc 'Run Only Smoke Tests'
15+
RSpec::Core::RakeTask.new(:smoke) do |t|
16+
t.pattern = './spec/smoke/*_spec.rb'
2517
end
2618

2719
task default: :spec

spec/integration/calls_api_integration_spec.rb renamed to spec/smoke/calls_api_spec.rb

File renamed without changes.

spec/integration/conferences_api_integration_spec.rb renamed to spec/smoke/conferences_api_spec.rb

File renamed without changes.

spec/integration/media_api_integration_spec.rb renamed to spec/smoke/media_api_spec.rb

File renamed without changes.

spec/integration/messages_api_integration_spec.rb renamed to spec/smoke/messages_api_spec.rb

File renamed without changes.

spec/integration/mfa_api_integration_spec.rb renamed to spec/smoke/mfa_api_spec.rb

File renamed without changes.

spec/integration/phone_number_lookup_api_integration_spec.rb renamed to spec/smoke/phone_number_lookup_api_spec.rb

File renamed without changes.

0 commit comments

Comments
 (0)