SWI-5429 Update Test Suite and Workflows (#137)

* SWI-5429 Update Test Suite and Workflows

* remove integration from test names

.github/workflows/deploy.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Install Packages and Test
         run: |
           bundle install
-          rake
+          rake unit
 
       - name: Deploy to Rubygems
         run: |

.github/workflows/test-nightly.yml

@@ -1,66 +1,61 @@
-name: Test Main Branch Nightly
+name: Nightly Smoke Tests
 
 on:
-    schedule:
-        - cron: "0 4 * * *"
+  schedule:
+    - cron: "0 4 * * *"
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
 
 env:
-    BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
-    BW_USERNAME: ${{ secrets.BW_USERNAME }}
-    BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
-    BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
-    BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
-    BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
-    BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
-    BW_NUMBER: ${{ secrets.BW_NUMBER }}
-    USER_NUMBER: ${{ secrets.USER_NUMBER }}
-    BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
-    MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
-    MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
-    MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
-    MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
+  BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
+  BW_USERNAME: ${{ secrets.BW_USERNAME }}
+  BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
+  BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
+  BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
+  BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
+  BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
+  BW_NUMBER: ${{ secrets.BW_NUMBER }}
+  USER_NUMBER: ${{ secrets.USER_NUMBER }}
+  BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
+  MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
+  MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
+  MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
+  MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
 
 jobs:
-    test_main:
-        name: Test Main Branch Nightly
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
-                ruby-version: [2.7, 3.0, 3.1, 3.2, 3.3]
-            fail-fast: false
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-              with:
-                  ref: "main"
+  test_main:
+    name: Nightly Smoke Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: "main"
 
-            - name: Set up Ruby
-              uses: ruby/setup-ruby@v1
-              with:
-                  ruby-version: ${{ matrix.ruby-version }}
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.2
 
-            - name: Install Packages and Test
-              run: |
-                  bundle install
-                  rake
-              env:
-                  RUBY_VERSION: ${{ matrix.ruby-version }}
-                  OPERATING_SYSTEM: ${{ matrix.os }}
+      - name: Install Packages and Test
+        run: |
+          bundle install
+          rake smoke
+        env:
+          RUBY_VERSION: 3.2
+          OPERATING_SYSTEM: ubuntu
 
-    notify_for_failures:
-        name: Notify for Failures
-        needs: [test_main]
-        if: failure()
-        runs-on: ubuntu-latest
-        steps:
-            - name: Notify Slack of Failures
-              uses: Bandwidth/[email protected]
-              with:
-                  job-status: failure
-                  slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
-                  slack-channel: ${{ secrets.SLACK_CHANNEL }}
+  notify_for_failures:
+    name: Notify for Failures
+    needs: [test_main]
+    if: failure()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify Slack of Failures
+        uses: Bandwidth/[email protected]
+        with:
+          job-status: failure
+          slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }}
+          slack-channel: ${{ secrets.SLACK_CHANNEL }}

.github/workflows/test-pr.yml

@@ -1,52 +1,52 @@
 name: Test PR
 
 on:
-    pull_request:
-        branches:
-            - main
+  pull_request:
+    branches:
+        - main
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.head_ref }}
-    cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
 
 env:
-    BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
-    BW_USERNAME: ${{ secrets.BW_USERNAME }}
-    BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
-    BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
-    BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
-    BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
-    BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
-    BW_NUMBER: ${{ secrets.BW_NUMBER }}
-    USER_NUMBER: ${{ secrets.USER_NUMBER }}
-    BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
-    MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
-    MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
-    MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
-    MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
+  BW_ACCOUNT_ID: ${{ secrets.BW_ACCOUNT_ID }}
+  BW_USERNAME: ${{ secrets.BW_USERNAME }}
+  BW_PASSWORD: ${{ secrets.BW_PASSWORD }}
+  BW_USERNAME_FORBIDDEN: ${{ secrets.BW_USERNAME_FORBIDDEN }}
+  BW_PASSWORD_FORBIDDEN: ${{ secrets.BW_PASSWORD_FORBIDDEN }}
+  BW_VOICE_APPLICATION_ID: ${{ secrets.BW_VOICE_APPLICATION_ID }}
+  BW_MESSAGING_APPLICATION_ID: ${{ secrets.BW_MESSAGING_APPLICATION_ID }}
+  BW_NUMBER: ${{ secrets.BW_NUMBER }}
+  USER_NUMBER: ${{ secrets.USER_NUMBER }}
+  BASE_CALLBACK_URL: ${{ secrets.BASE_CALLBACK_URL }}
+  MANTECA_ACTIVE_NUMBER: ${{ secrets.MANTECA_ACTIVE_NUMBER }}
+  MANTECA_IDLE_NUMBER: ${{ secrets.MANTECA_IDLE_NUMBER }}
+  MANTECA_BASE_URL: ${{ secrets.MANTECA_BASE_URL }}
+  MANTECA_APPLICATION_ID: ${{ secrets.MANTECA_APPLICATION_ID }}
 
 jobs:
-    test_pr:
-        name: Test PR
-        runs-on: ${{ matrix.os }}
-        strategy:
-            matrix:
-                os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
-                ruby-version: [2.7, 3.0, 3.1, 3.2, 3.3]
-            fail-fast: false
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
+  test_pr:
+    name: Test PR
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+          os: [windows-2022, windows-2019, ubuntu-20.04, ubuntu-22.04]
+          ruby-version: [2.7, 3.0, 3.1, 3.2, 3.3]
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-            - name: Set up Ruby
-              uses: ruby/setup-ruby@v1
-              with:
-                  ruby-version: ${{ matrix.ruby-version }}
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
 
-            - name: Install Packages and Test
-              run: |
-                  bundle install
-                  rake
-              env:
-                  RUBY_VERSION: ${{ matrix.ruby-version }}
-                  OPERATING_SYSTEM: ${{ matrix.os }}
+      - name: Install Packages and Test
+        run: |
+          bundle install
+          rake unit
+        env:
+          RUBY_VERSION: ${{ matrix.ruby-version }}
+          OPERATING_SYSTEM: ${{ matrix.os }}

Rakefile

@@ -8,20 +8,12 @@ begin
 
   desc 'Run Only Unit Tests'
   RSpec::Core::RakeTask.new(:unit) do |t|
-    t.pattern = './spec/api/**/*_spec.rb'
-  end
-  RSpec::Core::RakeTask.new(:unit) do |t|
-    t.pattern = './spec/models/**/*_spec.rb'
-  end
-
-  desc 'Run Only Integration Tests'
-  RSpec::Core::RakeTask.new(:integration) do |t|
-    t.pattern = './spec/integration/*_spec.rb'
+    t.pattern = './spec/unit/**/*_spec.rb'
   end
 
-  desc 'Run Only Client Unit Tests'
-  RSpec::Core::RakeTask.new(:client) do |t|
-    t.pattern = './spec/*_spec.rb'
+  desc 'Run Only Smoke Tests'
+  RSpec::Core::RakeTask.new(:smoke) do |t|
+    t.pattern = './spec/smoke/*_spec.rb'
   end
 
   task default: :spec

spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # Test Coverage Configuration
 require 'simplecov'
 SimpleCov.start do
-  add_filter 'spec/integration'
+  add_filter 'spec/smoke'
   add_filter 'spec/call_utils.rb'
   add_filter do |source_file|
     if !source_file.filename.include? 'bandwidth-sdk/models' then
@@ -89,7 +89,7 @@
       config.password = BW_PASSWORD
     end
     calls_api = Bandwidth::CallsApi.new
-    # cleanup_calls($active_calls, calls_api) # left out due to voice API issues
+    cleanup_calls($active_calls, calls_api)
   }
 
   # rspec-expectations config goes here. You can use an alternate