From 4da96a84fa8454ea43ba2e061f78ae1929d79caa Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Sun, 18 Dec 2016 15:59:51 -0500 Subject: [PATCH] fix tests --- doc/api/schemas/_map.json | 2 +- doc/api/schemas/_optid.json | 3 +++ spec/api/v2/maps_api_spec.rb | 7 ++++--- spec/factories/maps.rb | 1 + 4 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 doc/api/schemas/_optid.json diff --git a/doc/api/schemas/_map.json b/doc/api/schemas/_map.json index 755f5b3a..7e2381f8 100644 --- a/doc/api/schemas/_map.json +++ b/doc/api/schemas/_map.json @@ -34,7 +34,7 @@ "$ref": "_user.json" }, "source_id": { - "$ref": "_id.json" + "$ref": "_optid.json" }, "source": { "$ref": "_map.json" diff --git a/doc/api/schemas/_optid.json b/doc/api/schemas/_optid.json new file mode 100644 index 00000000..c34df067 --- /dev/null +++ b/doc/api/schemas/_optid.json @@ -0,0 +1,3 @@ +{ + "type": "integer|nil" +} diff --git a/spec/api/v2/maps_api_spec.rb b/spec/api/v2/maps_api_spec.rb index fbf07903..f7e30751 100644 --- a/spec/api/v2/maps_api_spec.rb +++ b/spec/api/v2/maps_api_spec.rb @@ -5,7 +5,8 @@ require 'rails_helper' RSpec.describe 'maps API', type: :request do let(:user) { create(:user, admin: true) } let(:token) { create(:token, user: user).token } - let(:map) { create(:map, user: user) } + let(:source) { create(:map, user: user) } + let(:map) { create(:map, user: user, source: source) } describe 'GET /api/v2/maps' do it 'returns all maps' do @@ -42,7 +43,7 @@ RSpec.describe 'maps API', type: :request do expect(response).to have_http_status(:success) expect(response).to match_json_schema(:map) - expect(Map.count).to eq 2 + expect(Map.count).to eq 3 end it 'PATCH /api/v2/maps/:id' do @@ -56,7 +57,7 @@ RSpec.describe 'maps API', type: :request do delete "/api/v2/maps/#{map.id}", params: { access_token: token } expect(response).to have_http_status(:no_content) - expect(Map.count).to eq 0 + expect(Map.count).to eq 1 end it 'POST /api/v2/maps/:id/stars' do diff --git a/spec/factories/maps.rb b/spec/factories/maps.rb index a95590e4..c69b43bb 100644 --- a/spec/factories/maps.rb +++ b/spec/factories/maps.rb @@ -4,6 +4,7 @@ FactoryGirl.define do sequence(:name) { |n| "Cool Map ##{n}" } permission :commons arranged { false } + source_id nil desc '' user end