Merge pull request #22 from pepabo/fix-broken-tests

Fix broken tests and update ruby versions

.github/workflows/ci.yaml

@@ -0,0 +1,27 @@
+name: Test
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ["3.1", "3.2", "3.3", "head"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake
+

lib/arisaid/bots.rb

@@ -14,7 +14,7 @@ def remote!
 
     class << self
       def bot_valid_attributes
-        %i(
+        %w(
           name
         )
       end

lib/arisaid/cli.rb

@@ -1,4 +1,3 @@
-require 'arisaid'
 require 'thor'
 
 module Arisaid

lib/arisaid/guests.rb

@@ -15,7 +15,7 @@ def remote!
 
     class << self
       def user_valid_attributes
-        %i(
+        %w(
           name
         )
       end

lib/arisaid/userable.rb

@@ -7,11 +7,6 @@ def users
     end
 
     def users!
-      all_users = []
-      client.users_list(presence: true, max_retries: 20) do |response|
-        all_users.concat(response.members)
-      end
-
       @users = all_users.select { |u|
         u.deleted == false && u.is_bot == false && u.is_restricted == false
       }
@@ -22,7 +17,7 @@ def guests
     end
 
     def guests!
-      @guests = client.users.select { |u|
+      @guests = all_users.select { |u|
         u.deleted == false && u.is_bot == false && u.is_restricted == true
       }
     end
@@ -32,9 +27,17 @@ def bots
     end
 
     def bots!
-      @bots = client.users.select { |u|
+      @bots = all_users.select { |u|
         u.deleted == false && u.is_bot == true && u.is_restricted == false
       }
     end
+
+    def all_users
+      all_users = []
+      client.users_list(presence: true, max_retries: 20) do |response|
+        all_users.concat(response.members)
+      end
+      all_users
+    end
   end
 end

lib/arisaid/users.rb

@@ -15,7 +15,7 @@ def remote!
 
     class << self
       def user_valid_attributes
-        %i(
+        %w(
           name
         )
       end

test/arisaid/bots_test.rb

@@ -11,15 +11,15 @@ class Arisaid_BotsTest < Minitest::Test
 YML
 
   def test_show
-    stub_get "users.list?token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
 
     assert_output(@@yml) do
       Arisaid.bots.show
     end
   end
 
   def test_save
-    stub_get "users.list?token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
 
     assert_silent do
       Arisaid.bots.save

test/arisaid/guests_test.rb

@@ -12,15 +12,15 @@ class Arisaid_GuestsTest < Minitest::Test
 YML
 
   def test_show
-    stub_get "users.list?token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
 
     assert_output(@@yml) do
       Arisaid.guests.show
     end
   end
 
   def test_save
-    stub_get "users.list?token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
 
     assert_silent do
       Arisaid.guests.save

test/arisaid/usergroups_test.rb

@@ -2,9 +2,10 @@
 
 class Arisaid_UsergroupsTest < Minitest::Test
   def test_apply
-    stub_get "users.list?token=#{Arisaid.slack_token}"
-    stub_get "usergroups.list?include_disabled=1&include_users=1&token=#{Arisaid.slack_token}"
-    stub_get "usergroups.create?description=Yo%20Members&handle=yo&name=yo&token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
+    stub_get "usergroups.list", Arisaid.slack_token
+    stub_get "usergroups.create", Arisaid.slack_token
+    stub_get "usergroups.users.update", Arisaid.slack_token
 
     File.write 'usergroups.yml', <<-YML.lstrip
 ---
@@ -21,15 +22,26 @@ def test_apply
   - foobar2
 YML
 
-    assert_silent do
+    output = <<-YML.lstrip
+==== Fetch all setting and enable groups ====
+  - tokyo
+  - yo
+==== Update usergroups ====
+  - tokyo
+  - yo
+==== Disable usergroups ====
+  - tokyo
+YML
+
+    assert_output(output) do
       Arisaid.usergroups.apply
     end
     File.delete 'usergroups.yml'
   end
 
   def test_show
-    stub_get "users.list?token=#{Arisaid.slack_token}"
-    stub_get "usergroups.list?include_disabled=1&include_users=1&token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
+    stub_get "usergroups.list", Arisaid.slack_token
 
     output = <<-YML.lstrip
 ---
@@ -47,8 +59,8 @@ def test_show
   end
 
   def test_save
-    stub_get "users.list?token=#{Arisaid.slack_token}"
-    stub_get "usergroups.list?include_disabled=1&include_users=1&token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
+    stub_get "usergroups.list" ,Arisaid.slack_token
 
     conf = <<-YML.lstrip
 ---

test/arisaid/users_test.rb

@@ -15,15 +15,15 @@ class Arisaid_UsersTest < Minitest::Test
 YML
 
   def test_show
-    stub_get "users.list?token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
 
     assert_output(@@yml) do
       Arisaid.users.show
     end
   end
 
   def test_save
-    stub_get "users.list?token=#{Arisaid.slack_token}"
+    stub_get "users.list", Arisaid.slack_token
 
     assert_silent do
       Arisaid.users.save

test/fixtures/usergroups.create?description=Yo%20Members&handle=yo&name=yo&token=xoxo-0000000000-0000000000-0000000000-000000 → test/fixtures/usergroups.create

@@ -1,5 +1,6 @@
 {
     "ok":true,
     "usergroup": {
+        "id": "S0615G0KT"
     }
 }

test/fixtures/usergroups.users.update

@@ -0,0 +1,28 @@
+{
+    "ok": true,
+    "usergroup": {
+        "id": "S0616NG6M",
+        "team_id": "T060R4BHN",
+        "is_usergroup": true,
+        "name": "Marketing Team",
+        "description": "Marketing gurus, PR experts and product advocates.",
+        "handle": "marketing-team",
+        "is_external": false,
+        "date_create": 1447096577,
+        "date_update": 1447102109,
+        "date_delete": 0,
+        "auto_type": null,
+        "created_by": "U060R4BJ4",
+        "updated_by": "U060R4BJ4",
+        "deleted_by": null,
+        "prefs": {
+            "channels": [],
+            "groups": []
+        },
+        "users": [
+            "U060R4BJ4",
+            "U060RNRCZ"
+        ],
+        "user_count": 1
+    }
+}

test/helper.rb

@@ -25,12 +25,12 @@ def json_response(file)
 
 def slack_url(url)
   return url if url =~ /^http/
-  url = File.join(Slack::Web::Client.new.api_endpoint, url)
+  url = File.join(Slack::Web::Config.endpoint, url)
   uri = Addressable::URI.parse(url)
   uri.to_s
 end
 
-def stub_get(endpoint)
-  stub_request(:get, slack_url(endpoint)).
+def stub_get(endpoint, token)
+  stub_request(:post, slack_url(endpoint)).
     to_return json_response("#{endpoint}")
 end