pull origin master

This commit is contained in:
Yan
2017-09-18 13:53:28 +06:30
parent 4f3b831771
commit 8966f290b5
122 changed files with 3964 additions and 2277 deletions

View File

@@ -23,7 +23,7 @@ require 'rails_helper'
# removed from Rails core in Rails 5, but can be added back in via the
# `rails-controller-testing` gem.
RSpec.describe Origami::InJutiesController, type: :controller do
RSpec.describe Origami::InDutiesController, type: :controller do
# This should return the minimal set of attributes required to create a valid
# InJuty. As you add validations to InJuty, be sure to
@@ -38,7 +38,7 @@ RSpec.describe Origami::InJutiesController, type: :controller do
# This should return the minimal set of values that should be in the session
# in order to pass any filters (e.g. authentication) defined in
# Origami::InJutiesController. Be sure to keep this updated too.
# Origami::InDutiesController. Be sure to keep this updated too.
let(:valid_session) { {} }
describe "GET #index" do

View File

@@ -1,5 +1,5 @@
require 'rails_helper'
RSpec.describe InJuty, type: :model do
RSpec.describe InDuty, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end