Invited users
- <% if @user.invitees.length > 0 %>
+ <% if @invitees.any? %>
- <% @user.invitees.order(cn: :asc).each do |invitee| %>
- <%= link_to invitee.cn, admin_user_path(invitee.cn), class: 'ks-text-link' %>
+ <% @recent_invitees.each do |invitee| %>
+ <%= link_to invitee.cn, admin_user_path(invitee.cn), class: "ks-text-link" %>
+ <% end %>
+ <% if @more_invitees > 0 %>
+ and <%= link_to "#{@more_invitees} more", admin_invitations_path(username: @user.cn), class: "ks-text-link" %>
<% end %>
<% else %>—<% end %>
diff --git a/app/views/contributions/donations/index.html.erb b/app/views/contributions/donations/index.html.erb
index 3e03617..2e9d33c 100644
--- a/app/views/contributions/donations/index.html.erb
+++ b/app/views/contributions/donations/index.html.erb
@@ -22,17 +22,17 @@
- <% if @donations_pending.any? %>
+ <% if @donations_processing.any? %>
Pending
<%= render partial: "contributions/donations/list",
- locals: { donations: @donations_pending } %>
+ locals: { donations: @donations_processing } %>
<% end %>
<% if @donations_completed.any? %>
- Past contributions
+ Contributions
<%= render partial: "contributions/donations/list",
locals: { donations: @donations_completed } %>
diff --git a/app/views/icons/_filter.html.erb b/app/views/icons/_filter.html.erb
index 38a47e0..5adc889 100644
--- a/app/views/icons/_filter.html.erb
+++ b/app/views/icons/_filter.html.erb
@@ -1 +1 @@
-",
- "Kosmos Dev "
- ]
- end
-
subject(:job) {
described_class.perform_later(user)
}
- before do
- stub_request(:post, "http://xmpp.example.com/api/private_set")
- .to_return(status: 200, body: "", headers: {})
- end
+ it "calls the service for setting default bookmarks" do
+ expect(EjabberdManager::SetDefaultBookmarks).to receive(:call)
+ .with(user: user).and_return(true)
- it "posts a private_set command to the ejabberd API" do
perform_enqueued_jobs { job }
-
- expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/private_set")
- .with { |req| req.body == '{"user":"willherschel","host":"kosmos.org","element":"\u003cstorage xmlns=\'storage:bookmarks\'\u003e\u003cconference jid=\'welcome@kosmos.chat\' name=\'Welcome\' autojoin=\'false\'\u003e\u003cnick\u003ewillherschel\u003c/nick\u003e\u003c/conference\u003e\u003cconference jid=\'kosmos-dev@kosmos.chat\' name=\'Kosmos Dev\' autojoin=\'false\'\u003e\u003cnick\u003ewillherschel\u003c/nick\u003e\u003c/conference\u003e\u003c/storage\u003e"}' }
end
after do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index a4e0f57..9b96edc 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -154,7 +154,7 @@ RSpec.describe User, type: :model do
it "removes all services from the LDAP entry" do
expect_any_instance_of(LdapService).to receive(:delete_attribute)
- .with(dn, :service).and_return(true)
+ .with(dn, :serviceEnabled).and_return(true)
user.disable_all_services
end
diff --git a/spec/requests/contributions/donations_spec.rb b/spec/requests/contributions/donations_spec.rb
index 01397eb..e6d1392 100644
--- a/spec/requests/contributions/donations_spec.rb
+++ b/spec/requests/contributions/donations_spec.rb
@@ -177,7 +177,7 @@ RSpec.describe "Donations", type: :request do
.to_return(status: 200, headers: {}, body: invoice)
stub_request(:get, "http://btcpay.example.com/api/v1/stores/123456/invoices/MCkDbf2cUgBuuisUCgnRnb/payment-methods")
.to_return(status: 200, headers: {}, body: payments)
-
+ allow(user).to receive(:add_member_status).with(:sustainer).and_return(["sustainer"])
get confirm_btcpay_contributions_donation_path(subject)
end
@@ -185,11 +185,16 @@ RSpec.describe "Donations", type: :request do
subject.reload
expect(subject.paid_at).not_to be_nil
expect(subject.amount_sats).to eq(2061)
+ expect(subject.payment_status).to eq("settled")
end
it "redirects to the donations index" do
expect(response).to redirect_to(contributions_donations_url)
end
+
+ it "updates the user's member status" do
+ expect(user).to have_received(:add_member_status).with(:sustainer)
+ end
end
describe "amount in sats" do
diff --git a/spec/services/ejabberd_manager/exchange_contacts_spec.rb b/spec/services/ejabberd_manager/exchange_contacts_spec.rb
new file mode 100644
index 0000000..b15e436
--- /dev/null
+++ b/spec/services/ejabberd_manager/exchange_contacts_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+require 'webmock/rspec'
+
+RSpec.describe EjabberdManager::ExchangeContacts, type: :model do
+ let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
+ let(:guest) { create :user, cn: "isaacnewton", ou: "kosmos.org",
+ id: 2, email: "hotapple42@eol.com" }
+
+ before do
+ stub_request(:post, "http://xmpp.example.com/api/add_rosteritem")
+ .to_return(status: 200, body: "", headers: {})
+ allow_any_instance_of(User).to receive(:services_enabled).and_return(["ejabberd"])
+ described_class.call(inviter: user, invitee: guest)
+ end
+
+ it "posts add_rosteritem commands to the ejabberd API" do
+ expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem")
+ .with { |req| req.body == '{"localuser":"isaacnewton","localhost":"kosmos.org","user":"willherschel","host":"kosmos.org","nick":"willherschel","group":"Buddies","subs":"both"}' }
+ expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/add_rosteritem")
+ .with { |req| req.body == '{"localuser":"willherschel","localhost":"kosmos.org","user":"isaacnewton","host":"kosmos.org","nick":"isaacnewton","group":"Buddies","subs":"both"}' }
+ end
+end
diff --git a/spec/services/ejabberd_manager/get_avatar_spec.rb b/spec/services/ejabberd_manager/get_avatar_spec.rb
new file mode 100644
index 0000000..f7772d5
--- /dev/null
+++ b/spec/services/ejabberd_manager/get_avatar_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+require 'webmock/rspec'
+
+RSpec.describe EjabberdManager::GetAvatar, type: :model do
+ let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
+ let(:img_base64) { File.read("#{Rails.root}/spec/fixtures/files/avatar-base64-png.txt").chomp }
+
+ context "when no avatar is set yet" do
+ before do
+ stub_request(:post, "http://xmpp.example.com/api/get_vcard2")
+ .with { |req| req.body == '{"user":"willherschel","host":"kosmos.org","name":"PHOTO","subname":"BINVAL"}' }
+ .to_return(status: 400, body: "", headers: {})
+ end
+
+ it "returns nil" do
+ res = described_class.call(user: user)
+ expect(res).to be_nil
+ end
+ end
+
+ context "when avatar exists" do
+ before do
+ stub_request(:post, "http://xmpp.example.com/api/get_vcard2")
+ .with { |req| req.body == '{"user":"willherschel","host":"kosmos.org","name":"PHOTO","subname":"BINVAL"}' }
+ .and_return(status: 200, body: { content: img_base64 }.to_json, headers: {})
+ stub_request(:post, "http://xmpp.example.com/api/get_vcard2")
+ .with { |req| req.body == '{"user":"willherschel","host":"kosmos.org","name":"PHOTO","subname":"TYPE"}' }
+ .and_return(status: 200, body: { content: "image/png" }.to_json, headers: {})
+ end
+
+ it "fetches the avatar and content type" do
+ res = described_class.call(user: user)
+ expect(res[:img_base64]).to eq(img_base64)
+ expect(res[:content_type]).to eq("image/png")
+ end
+ end
+end
diff --git a/spec/services/ejabberd_manager/set_default_bookmarks_spec.rb b/spec/services/ejabberd_manager/set_default_bookmarks_spec.rb
new file mode 100644
index 0000000..2986a4c
--- /dev/null
+++ b/spec/services/ejabberd_manager/set_default_bookmarks_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+require 'webmock/rspec'
+
+RSpec.describe EjabberdManager::SetDefaultBookmarks, type: :model do
+ let(:user) { create :user, cn: "willherschel", ou: "kosmos.org" }
+
+ before do
+ Setting.xmpp_default_rooms = [
+ "Welcome ",
+ "Kosmos Dev "
+ ]
+ stub_request(:post, "http://xmpp.example.com/api/private_set")
+ .to_return(status: 200, body: "", headers: {})
+
+ described_class.call(user:)
+ end
+
+ it "posts a private_set command to the ejabberd API" do
+ expect(WebMock).to have_requested(:post, "http://xmpp.example.com/api/private_set")
+ .with { |req| req.body == '{"user":"willherschel","host":"kosmos.org","element":"\u003cstorage xmlns=\'storage:bookmarks\'\u003e\u003cconference jid=\'welcome@kosmos.chat\' name=\'Welcome\' autojoin=\'false\'\u003e\u003cnick\u003ewillherschel\u003c/nick\u003e\u003c/conference\u003e\u003cconference jid=\'kosmos-dev@kosmos.chat\' name=\'Kosmos Dev\' autojoin=\'false\'\u003e\u003cnick\u003ewillherschel\u003c/nick\u003e\u003c/conference\u003e\u003c/storage\u003e"}' }
+ end
+end