From d8398caf2e19999a10982ea7a2c554e8f2c26255 Mon Sep 17 00:00:00 2001 From: cmrd Senya Date: Sat, 5 Aug 2017 15:43:33 +0300 Subject: [PATCH] Move misc_spec.rb to spec/spec spec/spec is a new folder for "tests for tests" --- spec/{ => spec}/misc_spec.rb | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) rename spec/{ => spec}/misc_spec.rb (76%) diff --git a/spec/misc_spec.rb b/spec/spec/misc_spec.rb similarity index 76% rename from spec/misc_spec.rb rename to spec/spec/misc_spec.rb index 2661bc774..494e8a91d 100644 --- a/spec/misc_spec.rb +++ b/spec/spec/misc_spec.rb @@ -2,23 +2,23 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -describe 'making sure the spec runner works' do - it 'factory creates a user with a person saved' do +describe "making sure the spec runner works" do + it "factory creates a user with a person saved" do user = FactoryGirl.create(:user) loaded_user = User.find(user.id) expect(loaded_user.person.owner_id).to eq(user.id) end - describe 'fixtures' do - it 'loads fixtures' do + describe "fixtures" do + it "loads fixtures" do expect(User.count).not_to eq(0) end end describe "#connect_users" do before do - @user1 = User.where(:username => 'alice').first - @user2 = User.where(:username => 'eve').first + @user1 = User.where(username: "alice").first + @user2 = User.where(username: "eve").first @aspect1 = @user1.aspects.first @aspect2 = @user2.aspects.first @@ -26,7 +26,7 @@ describe 'making sure the spec runner works' do connect_users(@user1, @aspect1, @user2, @aspect2) end - it 'connects the first user to the second' do + it "connects the first user to the second" do contact = @user1.contact_for @user2.person expect(contact).not_to be_nil expect(@user1.contacts.reload.include?(contact)).to be true @@ -34,7 +34,7 @@ describe 'making sure the spec runner works' do expect(contact.aspects.include?(@aspect1)).to be true end - it 'connects the second user to the first' do + it "connects the second user to the first" do contact = @user2.contact_for @user1.person expect(contact).not_to be_nil expect(@user2.contacts.reload.include?(contact)).to be true @@ -42,8 +42,8 @@ describe 'making sure the spec runner works' do expect(contact.aspects.include?(@aspect2)).to be true end - it 'allows posting after running' do - message = @user1.post(:status_message, :text => "Connection!", :to => @aspect1.id) + it "allows posting after running" do + message = @user1.post(:status_message, text: "Connection!", to: @aspect1.id) expect(@user2.reload.visible_shareables(Post)).to include message end end @@ -71,13 +71,17 @@ describe 'making sure the spec runner works' do describe "#post" do it "creates a notification with a mention" do expect { - alice.post(:status_message, :text => "@{Bob Grimn; #{bob.person.diaspora_handle}} you are silly", :to => alice.aspects.find_by_name('generic')) + alice.post( + :status_message, + text: "@{Bob Grimn; #{bob.person.diaspora_handle}} you are silly", + to: alice.aspects.find_by(name: "generic") + ) }.to change(Notification, :count).by(1) end end describe "#create_conversation_with_message" do - it 'creates a conversation and a message' do + it "creates a conversation and a message" do conversation = create_conversation_with_message(alice.person, bob.person, "Subject", "Hey Bob") expect(conversation.participants).to eq([alice.person, bob.person])