From a00adbce256ce89c494d56074290ffab9b0b5d9e Mon Sep 17 00:00:00 2001 From: Maximilian Grundke Date: Mon, 16 Oct 2017 14:02:40 +0200 Subject: [PATCH] Move *_url spec to controller, because the subscription model does not handle urls anymore --- .../submissions_controller_spec.rb | 21 +++++++++++++++++++ spec/models/submission_spec.rb | 15 ------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/spec/controllers/submissions_controller_spec.rb b/spec/controllers/submissions_controller_spec.rb index 3670645b..d1e489ff 100644 --- a/spec/controllers/submissions_controller_spec.rb +++ b/spec/controllers/submissions_controller_spec.rb @@ -183,6 +183,27 @@ describe SubmissionsController do expect_template(:show) end + describe 'GET #show.json' do + before(:each) { get :show, id: submission.id, format: :json } + expect_assigns(submission: :submission) + expect_status(200) + + [:render, :run, :test].each do |action| + describe "##{action}_url" do + let(:url) { response.body.send(:"#{action}_url") } + + it "starts like the #{action} path" do + filename = File.basename(__FILE__) + expect(url).to start_with(Rails.application.routes.url_helpers.send(:"#{action}_submission_path", submission, filename).sub(filename, '')) + end + + it 'ends with a placeholder' do + expect(url).to end_with(Submission::FILENAME_URL_PLACEHOLDER) + end + end + end + end + describe 'GET #score' do let(:request) { proc { get :score, id: submission.id } } before(:each) { request.call } diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb index 3c297ca4..75f0cf2a 100644 --- a/spec/models/submission_spec.rb +++ b/spec/models/submission_spec.rb @@ -16,21 +16,6 @@ describe Submission do expect(described_class.create.errors[:user_type]).to be_present end - [:render, :run, :test].each do |action| - describe "##{action}_url" do - let(:url) { submission.send(:"#{action}_url") } - - it "starts like the #{action} path" do - filename = File.basename(__FILE__) - expect(url).to start_with(Rails.application.routes.url_helpers.send(:"#{action}_submission_path", submission, filename).sub(filename, '')) - end - - it 'ends with a placeholder' do - expect(url).to end_with(Submission::FILENAME_URL_PLACEHOLDER) - end - end - end - describe '#main_file' do let(:submission) { FactoryGirl.create(:submission) }