From fc6893d4fc6ec8ba7f3efa45d39b1ff40dfc832a Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Thu, 4 Oct 2018 01:16:05 +0200 Subject: [PATCH] Remove facebook integration Facebook removed the API and facebook integration is broken now, so lets remove it. closes #7874 --- Changelog.md | 1 + Gemfile | 1 - Gemfile.lock | 3 - .../social-media-logos/facebook-16x16.png | Bin 307 -> 0 bytes .../social-media-logos/facebook-24x24.png | Bin 814 -> 0 bytes .../social-media-logos/facebook-32x32.png | Bin 1221 -> 0 bytes app/assets/stylesheets/navbar_left.scss | 1 - app/models/services/facebook.rb | 58 ---------- app/views/users/getting_started.haml | 4 - app/views/users/getting_started.mobile.haml | 4 - config/defaults.yml | 11 +- config/diaspora.yml.example | 16 +-- config/initializers/omniauth.rb | 11 -- config/locales/diaspora/en.yml | 3 - db/migrate/20181004003638_remove_facebook.rb | 14 +++ lib/configuration_methods.rb | 2 +- .../jasmine_fixtures/aspects_spec.rb | 4 +- spec/controllers/services_controller_spec.rb | 44 ++------ .../status_messages_controller_spec.rb | 13 +-- spec/javascripts/app/models/user_spec.js | 4 +- spec/lib/configuration_methods_spec.rb | 9 -- .../lib/diaspora/federated/retraction_spec.rb | 3 +- spec/models/service_spec.rb | 53 ++++----- spec/models/services/facebook_spec.rb | 103 ------------------ spec/presenters/node_info_presenter_spec.rb | 10 +- .../status_message_creation_service_spec.rb | 4 +- spec/workers/delete_post_from_service_spec.rb | 2 +- 27 files changed, 72 insertions(+), 306 deletions(-) delete mode 100644 app/assets/images/social-media-logos/facebook-16x16.png delete mode 100644 app/assets/images/social-media-logos/facebook-24x24.png delete mode 100644 app/assets/images/social-media-logos/facebook-32x32.png delete mode 100644 app/models/services/facebook.rb create mode 100644 db/migrate/20181004003638_remove_facebook.rb delete mode 100644 spec/models/services/facebook_spec.rb diff --git a/Changelog.md b/Changelog.md index 0bf125641..af6473929 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ ## Refactor * Remove mention of deprecated `statistic.json` [#7867](https://github.com/diaspora/diaspora/pull/7867) * Add quotes in `database.yml.example` to fields that may contain special characters [#7875](https://github.com/diaspora/diaspora/pull/7875) +* Removed broken, and thus deprecated, Facebook integration [#7874](https://github.com/diaspora/diaspora/pull/7874) ## Bug fixes * Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830) diff --git a/Gemfile b/Gemfile index 6138dc7b8..559a40581 100644 --- a/Gemfile +++ b/Gemfile @@ -157,7 +157,6 @@ gem "secure_headers", "5.0.5" # Services gem "omniauth", "1.8.1" -gem "omniauth-facebook", "4.0.0" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" gem "omniauth-wordpress", "0.2.2" diff --git a/Gemfile.lock b/Gemfile.lock index b786149c0..1af644261 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -408,8 +408,6 @@ GEM omniauth (1.8.1) hashie (>= 3.4.6, < 3.6.0) rack (>= 1.6.2, < 3) - omniauth-facebook (4.0.0) - omniauth-oauth2 (~> 1.2) omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) @@ -820,7 +818,6 @@ DEPENDENCIES mysql2 (= 0.5.0) nokogiri (= 1.8.2) omniauth (= 1.8.1) - omniauth-facebook (= 4.0.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) diff --git a/app/assets/images/social-media-logos/facebook-16x16.png b/app/assets/images/social-media-logos/facebook-16x16.png deleted file mode 100644 index 7ae54147a5eb610978bb6343c038528ad87ea384..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}cz{oc>!TOnF5GzCKKp3R#QlYx zI|@2>_2Si&^YBwfTZ%nRUlTfuGzI;_o+1i-0l@Z0OA_|v==PwS;UlEwI z)F*wRcgigH+nF`2_>HxWImfmH$`d0~O|Zx;TbN zNU|P0&37=mUqFwXutdbvdTxn;=ZH6 z>>Lj3Gtc=UGo&`Vur~sN=RV|A3@zeqIlx)_7}Cpzq=6AgJL@B`CMCG1w{^iOb3GhO z@j|Sz29@_Rq+o~lA#i{oeSMk~K%|rofXOi^`&5SyYX*DCRuSCZVVIoy1R+1(Ma7#O zkbm(m=!HH+8W==mZ!8&5)a2b){qTF^uL^u4a?bmM0cNKUbhaMQZo**iM^wFc)AO*l z{znDA5f=AwFu+vW4~d1Hcz`w8+Koy*2J4m84dzng6Pi=Z<4q30V@XBbpvf1*f$u!C zyz+}s%@Ah_#9)A?pc6t#$n8K>J~FXN=G*c*gLPC=wS-5t!vP7ow;?{O9Z(6X$s?Z^ z*1|F~7f|hUKz#NsK;kT|s08(xxi3G%^6143%`qGhXK4fCxcMgg&HdT=)v(lwFL~}{ zMk{JC;6z3X5J%ISL&2WP&&>T`Hti}r2Vg(}J2v<*i3=oPvQt})SZES!@ZJh#IjMCSmD&F2qFEfXA*Jz#Z?C2n3G8hN-c$sn*n2>4 z>m;xysAhfsc7fPx7EuP6%lbfP6Tu*K%V@2ljG-7k_nGm@uME!$%2~Y00jG0X0;wfk zpe^cvokX`Nri>n_{3F?t5 se3)93+ZNb;$jN{DJJ4X-HY4Eef9@81$Yn|JL;wH)07*qoM6N<$f`5m5&j0`b diff --git a/app/assets/images/social-media-logos/facebook-32x32.png b/app/assets/images/social-media-logos/facebook-32x32.png deleted file mode 100644 index 360df4478d00488bf83089585df760a495c294d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1221 zcmV;$1UmbPP);j4?cUWM-Ch2BMr6DZhD6k8=EG(3iMpWLW zadN8Bnlh%QdqW}$B3`!BdtT<*_w4R>8-9|R&zy6f_go&9AAk)0df=hD2Nm6lsry7X z-;~Fvikc!bd%MoW_Vu2p*L%)dg16-O<`K+5OF!4%eKy9o_@*|&ZVDTRXZ9TYj4EF} zNgm((xoGT+($A$bo>#`yNKfsRRXw~o`c<|q|5jcSU0<1$ZM^9*W7 zeV8_v`6#cn%0~2y9Rx> z+7Q{Rd+Frq%QSy;iIToBuS`dEtlM|W7}%|TE`{Ex`VJz9Af29~xxGP}o4-Z(V*gsg zy%KfP7$|?`1UVW;GzGO`RtTs4-B~6jiQ$fLh1d8+Rn=0~R}kfi1fN1YRib1E|%pfrNMDnYnLhR_DA%GuLiQSmQTfwci+c ze*19(FYX+Ovw24!G~}pt{Ojt{O2JOdD+B$;z;mU?NTDA4)S-UF1U8i&=N{BL|9$4x zium~aG-kw3VPKPTwXx(VaYW9<^|E7@Z@>P%xFSxSo0j{4G4QN%_O!cK!#O~Wx8(Zg zKW?swLxBr&A97=0qvt3wSw%e@0W=xY=F`6|Nd9jhbYtMjLO(GZw)GJ5tm0nemNhi! zKm0N;QAds>&)^2;i~$xUPdK||j)(=8@8A7&L&7?cy)qgD>s@|Y@AT7J`(X{&402Ih zM&{D=b&1tHG++#@b951tS@52YYYIA1r)8bp^fO;ynUmlReW(G~(!gPQJntZ_v2}8k zK-b8g%=|+d)EB>>lb|>44t3KQSZjNi9?5=-9#%Y-+o5?h=YWpT05nA87rwnFk-e5P ztMfXHffC;cIqQeWQ8&owys$AWHC-dRl#UvFacNefdO})vHH5e~rN6i-oM^ya8w5PW zq-cn23^h3S%~c8apx<(zTN-dThpC_@Kn^to*d;WM_T^e*QwyNu?etgwNaQT?gqm-f zKgrlY^#J8pC7_%RCe*g-pw^(v`01B3lH^&nKLAaCbEUqB_yoM+7=J8zd_*-_!EeA; zlUxTA>U?!f%peEKK#)Am!!a1>e#Y&eEo~bmXTuQXt7XjA%6_1R0y^R?S1my;`ecvH z#alq%;9GnX|C+7RzY#tD+2ZC :controller do end it 'generates a jasmine fixture with services', :fixture => true do - alice.services << Services::Facebook.create(:user_id => alice.id) - alice.services << Services::Twitter.create(:user_id => alice.id) + alice.services << Services::Twitter.create(user_id: alice.id) + alice.services << Services::Tumblr.create(user_id: alice.id) get :aspects, params: {prefill: "reshare things"} save_fixture(html_for("body"), "aspects_index_services") end diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb index a1c333915..38ee497c4 100644 --- a/spec/controllers/services_controller_spec.rb +++ b/spec/controllers/services_controller_spec.rb @@ -5,12 +5,14 @@ # the COPYRIGHT file. describe ServicesController, :type => :controller do - let(:omniauth_auth) do - { 'provider' => 'facebook', - 'uid' => '2', - 'info' => { 'nickname' => 'grimmin', 'image' => 'http://graph.facebook.com/2/picture' }, - 'credentials' => { 'token' => 'tokin', 'secret' =>"not_so_much" }} - end + let(:omniauth_auth) { + { + "provider" => "tumblr", + "uid" => "2", + "info" => {"nickname" => "grimmin"}, + "credentials" => {"token" => "token", "secret" => "not_so_much"} + } + } let(:user) { alice } before do @@ -37,22 +39,13 @@ describe ServicesController, :type => :controller do it 'creates a new service and associates it with the current user' do expect { - post :create, params: {provider: "facebook"} + post :create, params: {provider: "twitter"} }.to change(user.services, :count).by(1) end it 'saves the provider' do - post :create, params: {provider: "facebook"} - expect(user.reload.services.first.class.name).to eq("Services::Facebook") - end - - context "when the user hasn't got a profile photo on Diaspora" do - before { user.person.profile.update_attribute :image_url, nil } - - it "imports the profile photo from the service" do - expect(Workers::FetchProfilePhoto).to receive(:perform_async) - post :create, params: {provider: "facebook"} - end + post :create, params: {provider: "twitter"} + expect(user.reload.services.first.class.name).to eq("Services::Tumblr") end context 'when service exists with the same uid' do @@ -97,23 +90,10 @@ describe ServicesController, :type => :controller do end end - context 'Facebook' do - before do - facebook_auth_without_twitter_extras = { 'provider' => 'facebook', 'extras' => { 'someotherkey' => 'lorem'}} - request.env['omniauth.auth'] = omniauth_auth.merge!( facebook_auth_without_twitter_extras ) - end - - it "doesn't break when twitter-specific extras aren't available in omniauth hash" do - expect { - post :create, params: {provider: "facebook"} - }.to change(user.services, :count).by(1) - end - end - context 'when fetching a photo' do before do omniauth_auth - omniauth_auth["info"].merge!({"image" => "https://service.com/fallback_lowres.jpg"}) + omniauth_auth["info"]["image"] = "https://service.com/fallback_lowres.jpg" request.env['omniauth.auth'] = omniauth_auth end diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index d38c12289..14e6999ab 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/spec/controllers/status_messages_controller_spec.rb @@ -141,20 +141,17 @@ describe StatusMessagesController, :type => :controller do end it "dispatches the post to the specified services" do - s1 = Services::Facebook.new - alice.services << s1 alice.services << Services::Twitter.new - status_message_hash[:services] = ['facebook'] + status_message_hash[:services] = ["twitter"] service_types = Service.titles(status_message_hash[:services]) - expect(alice).to receive(:dispatch_post).with(anything(), hash_including(:service_types => service_types)) + expect(alice).to receive(:dispatch_post).with(anything, hash_including(service_types: service_types)) post :create, params: status_message_hash end it "works if services is a string" do - s1 = Services::Facebook.new - alice.services << s1 - status_message_hash[:services] = "facebook" - expect(alice).to receive(:dispatch_post).with(anything(), hash_including(:service_types => ["Services::Facebook"])) + alice.services << Services::Twitter.new + status_message_hash[:services] = "twitter" + expect(alice).to receive(:dispatch_post).with(anything, hash_including(service_types: ["Services::Twitter"])) post :create, params: status_message_hash end diff --git a/spec/javascripts/app/models/user_spec.js b/spec/javascripts/app/models/user_spec.js index 621b35a36..4d80b0873 100644 --- a/spec/javascripts/app/models/user_spec.js +++ b/spec/javascripts/app/models/user_spec.js @@ -16,8 +16,8 @@ describe("app.models.User", function(){ describe("isServiceConnected", function(){ it("checks to see if the sent provider name is a configured service", function(){ - this.user.set({configured_services : ["facebook"]}); - expect(this.user.isServiceConfigured("facebook")).toBeTruthy(); + this.user.set({configured_services: ["twitter"]}); // eslint-disable-line camelcase + expect(this.user.isServiceConfigured("twitter")).toBeTruthy(); expect(this.user.isServiceConfigured("tumblr")).toBeFalsy(); }); }); diff --git a/spec/lib/configuration_methods_spec.rb b/spec/lib/configuration_methods_spec.rb index eeb963185..ae812578c 100644 --- a/spec/lib/configuration_methods_spec.rb +++ b/spec/lib/configuration_methods_spec.rb @@ -94,22 +94,17 @@ describe Configuration::Methods do allow(disabled).to receive(:enable?).and_return(false) allow(services).to receive(:twitter).and_return(enabled) allow(services).to receive(:tumblr).and_return(enabled) - allow(services).to receive(:facebook).and_return(disabled) allow(services).to receive(:wordpress).and_return(disabled) allow(@settings).to receive(:services).and_return(services) expect(@settings.configured_services).to include :twitter expect(@settings.configured_services).to include :tumblr - expect(@settings.configured_services).not_to include :facebook expect(@settings.configured_services).not_to include :wordpress end end describe "#show_service" do before do - AppConfig.services.twitter.authorized = true AppConfig.services.twitter.enable = true - AppConfig.services.facebook.authorized = true - AppConfig.services.facebook.enable = true AppConfig.services.wordpress.authorized = false AppConfig.services.wordpress.enable = true AppConfig.services.tumblr.authorized = "alice" @@ -120,10 +115,6 @@ describe Configuration::Methods do expect(AppConfig.show_service?("twitter", bob)).to be_truthy end - it "shows service with authorized key true" do - expect(AppConfig.show_service?("facebook", bob)).to be_truthy - end - it "doesn't show service with authorized key false" do expect(AppConfig.show_service?("wordpress", bob)).to be_falsey end diff --git a/spec/lib/diaspora/federated/retraction_spec.rb b/spec/lib/diaspora/federated/retraction_spec.rb index 1fe6b9d56..ff1149064 100644 --- a/spec/lib/diaspora/federated/retraction_spec.rb +++ b/spec/lib/diaspora/federated/retraction_spec.rb @@ -79,8 +79,7 @@ describe Retraction do it "adds service metadata to queued job for deletion" do post.tweet_id = "123" twitter = Services::Twitter.new(access_token: "twitter") - facebook = Services::Facebook.new(access_token: "facebook") - alice.services << twitter << facebook + alice.services << twitter retraction = Retraction.for(post) federation_retraction = Diaspora::Federation::Entities.retraction(retraction) diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index 57223b981..7c00889b8 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -1,58 +1,59 @@ # frozen_string_literal: true -describe Service, :type => :model do +describe Service, type: :model do before do - @post = alice.post(:status_message, :text => "hello", :to => alice.aspects.first.id) - @service = Services::Facebook.new(:access_token => "yeah", :uid => 1) + @post = alice.post(:status_message, text: "hello", to: alice.aspects.first.id) + @service = Services::Twitter.new(access_token: "yeah", uid: 1) alice.services << @service end - it 'is unique to a user by service type and uid' do + it "is unique to a user by service type and uid" do @service.save - second_service = Services::Facebook.new(:access_token => "yeah", :uid => 1) + second_service = Services::Twitter.new(access_token: "yeah", uid: 1) alice.services << second_service alice.services.last.save expect(alice.services.last).to be_invalid end - it 'by default has no profile photo url' do - expect( described_class.new.profile_photo_url ).to be_nil + it "by default has no profile photo url" do + expect(described_class.new.profile_photo_url).to be_nil end - describe '.titles' do + describe ".titles" do it "converts passed service titles into service constants" do - expect( described_class.titles( ['twitter'] ) ).to eql ['Services::Twitter'] + expect(described_class.titles(["twitter"])).to eql ["Services::Twitter"] end end - describe '.first_from_omniauth' do - let(:omniauth) { { 'provider' => 'facebook', 'uid' => '1', 'credentials' => {}, 'info' => {} } } - it 'first service by provider and uid' do - expect( described_class.first_from_omniauth( omniauth ) ).to eql @service + describe ".first_from_omniauth" do + let(:omniauth) { {"provider" => "twitter", "uid" => "1", "credentials" => {}, "info" => {}} } + it "first service by provider and uid" do + expect(described_class.first_from_omniauth(omniauth)).to eql @service end end - describe '.initialize_from_omniauth' do + describe ".initialize_from_omniauth" do let(:omniauth) do - { 'provider' => 'facebook', - 'uid' => '2', - 'info' => { 'nickname' => 'grimmin' }, - 'credentials' => { 'token' => 'tokin', 'secret' =>"not_so_much" } + { + "provider" => "twitter", + "uid" => "2", + "info" => {"nickname" => "grimmin"}, + "credentials" => {"token" => "token", "secret" => "not_so_much"} } end - let(:subject) { described_class.initialize_from_omniauth( omniauth ) } + let(:subject) { described_class.initialize_from_omniauth(omniauth) } - it 'new service obj of type Services::Facebook' do - expect( subject.type ).to eql "Services::Facebook" + it "new service obj of type Services::Twitter" do + expect(subject.type).to eql "Services::Twitter" end - it 'new service obj with oauth options populated' do - expect( subject.uid ).to eql "2" - expect( subject.nickname ).to eql "grimmin" - expect( subject.access_token ).to eql "tokin" - expect( subject.access_secret ).to eql "not_so_much" + it "new service obj with oauth options populated" do + expect(subject.uid).to eql "2" + expect(subject.nickname).to eql "grimmin" + expect(subject.access_token).to eql "token" + expect(subject.access_secret).to eql "not_so_much" end end end diff --git a/spec/models/services/facebook_spec.rb b/spec/models/services/facebook_spec.rb deleted file mode 100644 index 6df24fe10..000000000 --- a/spec/models/services/facebook_spec.rb +++ /dev/null @@ -1,103 +0,0 @@ -# frozen_string_literal: true - -describe Services::Facebook, :type => :model do - before do - @user = alice - @post = @user.post(:status_message, :text => "hello", :to =>@user.aspects.first.id, :public =>true, :photos => []) - @service = Services::Facebook.new(:access_token => "yeah") - @user.services << @service - end - - describe '#post' do - it 'posts a status message to facebook' do - stub_request(:post, "https://graph.facebook.com/me/feed"). - to_return(:status => 200, :body => '{"id": "12345"}', :headers => {}) - @service.post(@post) - end - - it 'removes text formatting markdown from post text' do - message = double(urls: []) - expect(message).to receive(:plain_text_without_markdown).and_return("") - post = double(message: message, photos: []) - post_params = @service.create_post_params(post) - end - - it "adds '(via )'" do - message = "Some text." - post = double(message: double(plain_text_without_markdown: message, urls: []), photos: []) - post_params = @service.create_post_params(post) - expect(post_params[:message]).to include "(via http:" - end - - it "sets facebook id on post" do - stub_request(:post, "https://graph.facebook.com/me/feed") - .to_return(status: 200, body: '{"id": "12345"}', headers: {}) - @service.post(@post) - expect(@post.facebook_id).to match "12345" - end - end - - describe "with photo" do - before do - @photos = [alice.build_post(:photo, pending: true, user_file: File.open(photo_fixture_name)), - alice.build_post(:photo, pending: true, user_file: File.open(photo_fixture_name))] - - @photos.each(&:save!) - end - - it "should include post url in message with photos as (via... " do - @status_message = alice.build_post(:status_message, text: "the best pebble.") - @status_message.photos << @photos - - @status_message.save! - alice.add_to_streams(@status_message, alice.aspects) - - post_params = @service.create_post_params(@status_message) - expect(post_params[:message]).to include "(via http:" - end - - it "should include post url in message with photos when no text message" do - @status_message = alice.build_post(:status_message, text: "") - @status_message.photos << @photos - - @status_message.save! - alice.add_to_streams(@status_message, alice.aspects) - - post_params = @service.create_post_params(@status_message) - expect(post_params[:message]).to include "http:" - end - - end - - describe "#profile_photo_url" do - it 'returns a large profile photo url' do - @service.uid = "abc123" - @service.access_token = "token123" - expect(@service.profile_photo_url).to eq( - "https://graph.facebook.com/abc123/picture?type=large&access_token=token123" - ) - end - end - - describe "#post_opts" do - it "returns the facebook_id of the post" do - @post.facebook_id = "2345" - expect(@service.post_opts(@post)).to eq(facebook_id: "2345") - end - - it "returns nil when the post has no facebook_id" do - expect(@service.post_opts(@post)).to be_nil - end - end - - describe "#delete_from_service" do - it "removes a post from facebook" do - facebook_id = "2345" - url = "https://graph.facebook.com/#{facebook_id}/" - stub_request(:delete, "#{url}?access_token=#{@service.access_token}").to_return(status: 200) - expect(@service).to receive(:delete_from_facebook).with(url, access_token: @service.access_token) - - @service.delete_from_service(facebook_id: facebook_id) - end - end -end diff --git a/spec/presenters/node_info_presenter_spec.rb b/spec/presenters/node_info_presenter_spec.rb index 8dcc0894b..8929213b0 100644 --- a/spec/presenters/node_info_presenter_spec.rb +++ b/spec/presenters/node_info_presenter_spec.rb @@ -52,10 +52,6 @@ describe NodeInfoPresenter do context "when services are enabled" do before do AppConfig.services = { - "facebook" => { - "enable" => true, - "authorized" => true - }, "twitter" => {"enable" => true}, "wordpress" => {"enable" => false}, "tumblr" => { @@ -66,17 +62,13 @@ describe NodeInfoPresenter do end it "provides services" do - expect(hash).to include "services" => include("outbound" => %w(twitter facebook)) + expect(hash).to include "services" => include("outbound" => ["twitter"]) end end context "when some services are set to username authorized" do before do AppConfig.services = { - "facebook" => { - "enable" => true, - "authorized" => "bob" - }, "twitter" => {"enable" => true}, "wordpress" => { "enable" => true, diff --git a/spec/services/status_message_creation_service_spec.rb b/spec/services/status_message_creation_service_spec.rb index aaca06da3..cc4a35d85 100644 --- a/spec/services/status_message_creation_service_spec.rb +++ b/spec/services/status_message_creation_service_spec.rb @@ -169,8 +169,8 @@ describe StatusMessageCreationService do it "dispatches the StatusMessage to services" do expect(alice).to receive(:dispatch_post) .with(instance_of(StatusMessage), - hash_including(service_types: array_including(%w(Services::Facebook Services::Twitter)))) - StatusMessageCreationService.new(alice).create(params.merge(services: %w(twitter facebook))) + hash_including(service_types: array_including(%w[Services::Tumblr Services::Twitter]))) + StatusMessageCreationService.new(alice).create(params.merge(services: %w[twitter tumblr])) end context "with mention" do diff --git a/spec/workers/delete_post_from_service_spec.rb b/spec/workers/delete_post_from_service_spec.rb index 48a9b85c1..bea4da827 100644 --- a/spec/workers/delete_post_from_service_spec.rb +++ b/spec/workers/delete_post_from_service_spec.rb @@ -3,7 +3,7 @@ describe Workers::DeletePostFromService do it "calls service#delete_from_service with given opts" do service = double - opts = {facebook_id: "23456"} + opts = {twitter_id: "23456"} expect(service).to receive(:delete_from_service).with(opts) allow(Service).to receive(:find_by_id).with("123").and_return(service)