about summary refs log tree commit diff
path: root/spec/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-12-05 23:02:27 +0100
committerGitHub <noreply@github.com>2017-12-05 23:02:27 +0100
commite20895f251d28b3631b1f5768302517a5b687b04 (patch)
tree88e86cef53df51df32e964921d444c08f34dd3a5 /spec/services
parent12cea76634d8380e24c3b218b18955b551995e1e (diff)
Add list of lists component to web UI (#5811)
* Add list of lists component to web UI

* Add list adding

* Add list removing

* List editor modal

* Add API account search limited by following=true relation

* Rework list editor modal

* Remove mandatory pagination of GET /api/v1/lists/:id/accounts

* Adjust search input placeholder

* Fix rspec (#5890)

* i18n: (zh-CN) Add missing translations for #5811 (#5891)

* i18n: (zh-CN) yarn manage:translations -- zh-CN

* i18n: (zh-CN) Add missing translations for #5811

* Fix some issues

- Display loading/missing state for list timelines
- Order lists alphabetically in overview
- Fix async list editor reset
- Redirect to /lists after deleting unpinned list
- Redirect to / after pinning a list

* Remove dead list columns when a list is deleted or fetch returns 404
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/account_search_service_spec.rb10
-rw-r--r--spec/services/search_service_spec.rb2
2 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/account_search_service_spec.rb b/spec/services/account_search_service_spec.rb
index 25bb56bca..4685e619f 100644
--- a/spec/services/account_search_service_spec.rb
+++ b/spec/services/account_search_service_spec.rb
@@ -72,7 +72,7 @@ describe AccountSearchService do
         describe 'and there is no account provided' do
           it 'uses search_for to find matches' do
             allow(Account).to receive(:search_for)
-            subject.call('two@example.com', 10, false, nil)
+            subject.call('two@example.com', 10, nil, resolve: false)
 
             expect(Account).to have_received(:search_for).with('two example.com', 10)
           end
@@ -82,9 +82,9 @@ describe AccountSearchService do
           it 'uses advanced_search_for to find matches' do
             account = Fabricate(:account)
             allow(Account).to receive(:advanced_search_for)
-            subject.call('two@example.com', 10, false, account)
+            subject.call('two@example.com', 10, account, resolve: false)
 
-            expect(Account).to have_received(:advanced_search_for).with('two example.com', account, 10)
+            expect(Account).to have_received(:advanced_search_for).with('two example.com', account, 10, nil)
           end
         end
       end
@@ -125,7 +125,7 @@ describe AccountSearchService do
         service = double(call: nil)
         allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
 
-        results = subject.call('newuser@remote.com', 10, true)
+        results = subject.call('newuser@remote.com', 10, nil, resolve: true)
         expect(service).to have_received(:call).with('newuser@remote.com')
       end
 
@@ -133,7 +133,7 @@ describe AccountSearchService do
         service = double(call: nil)
         allow(ResolveRemoteAccountService).to receive(:new).and_return(service)
 
-        results = subject.call('newuser@remote.com', 10, false)
+        results = subject.call('newuser@remote.com', 10, nil, resolve: false)
         expect(service).not_to have_received(:call)
       end
     end
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index 00475c699..3ffcc389b 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -68,7 +68,7 @@ describe SearchService do
           allow(AccountSearchService).to receive(:new).and_return(service)
 
           results = subject.call(query, 10)
-          expect(service).to have_received(:call).with(query, 10, false, nil)
+          expect(service).to have_received(:call).with(query, 10, nil, resolve: false)
           expect(results).to eq empty_results.merge(accounts: [account])
         end
       end