about summary refs log tree commit diff
path: root/spec/controllers/emojis_controller_spec.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-09-21 08:39:07 +0200
committerGitHub <noreply@github.com>2018-09-21 08:39:07 +0200
commit17464c10ad1693095a05fe445587804589d627e1 (patch)
treeecd2a077b038b864ac7912cba72dd59990fb6258 /spec/controllers/emojis_controller_spec.rb
parent382cdd7f959480d59fee5646be320d6076cb18d8 (diff)
parent343acd96cccb16b1ecdc3a52a8733359d4a92633 (diff)
Merge pull request #739 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/controllers/emojis_controller_spec.rb')
-rw-r--r--spec/controllers/emojis_controller_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb
index 68bae256d..fbbd11f64 100644
--- a/spec/controllers/emojis_controller_spec.rb
+++ b/spec/controllers/emojis_controller_spec.rb
@@ -6,11 +6,11 @@ describe EmojisController do
   let(:emoji) { Fabricate(:custom_emoji) }
 
   describe 'GET #show' do
-    subject(:responce) { get :show, params: { id: emoji.id, format: :json } }
+    subject(:response) { get :show, params: { id: emoji.id, format: :json } }
     subject(:body) { JSON.parse(response.body, symbolize_names: true) }
 
     it 'returns the right response' do
-      expect(responce).to have_http_status 200
+      expect(response).to have_http_status 200
       expect(body[:name]).to eq ':coolcat:'
     end
   end