From 7b0db433c457ab530aa0dfc66930f61526202dcb Mon Sep 17 00:00:00 2001 From: Zin Lin Phyo Date: Mon, 21 Aug 2017 13:30:04 +0630 Subject: [PATCH] commissioner scaffold --- .idea/workspace.xml | 213 ++++++++++++++---- app/assets/javascripts/commissioners.coffee | 3 + app/assets/stylesheets/commissioners.scss | 3 + app/controllers/commissioners_controller.rb | 74 ++++++ app/helpers/commissioners_helper.rb | 2 + app/models/commissioner.rb | 2 + .../commissioners/_commissioner.json.jbuilder | 2 + app/views/commissioners/_form.html.erb | 10 + app/views/commissioners/edit.html.erb | 6 + app/views/commissioners/index.html.erb | 25 ++ app/views/commissioners/index.json.jbuilder | 1 + app/views/commissioners/new.html.erb | 5 + app/views/commissioners/show.html.erb | 4 + app/views/commissioners/show.json.jbuilder | 1 + config/routes.rb | 1 + .../20170818090115_create_commissioners.rb | 12 + .../commissioners_controller_spec.rb | 141 ++++++++++++ spec/helpers/commissioners_helper_spec.rb | 15 ++ spec/models/commissioner_spec.rb | 5 + spec/requests/commissioners_spec.rb | 10 + spec/routing/commissioners_routing_spec.rb | 39 ++++ .../views/commissioners/edit.html.erb_spec.rb | 14 ++ .../commissioners/index.html.erb_spec.rb | 14 ++ spec/views/commissioners/new.html.erb_spec.rb | 14 ++ .../views/commissioners/show.html.erb_spec.rb | 11 + test/system/commissioners_test.rb | 9 + 26 files changed, 586 insertions(+), 50 deletions(-) create mode 100644 app/assets/javascripts/commissioners.coffee create mode 100644 app/assets/stylesheets/commissioners.scss create mode 100644 app/controllers/commissioners_controller.rb create mode 100644 app/helpers/commissioners_helper.rb create mode 100644 app/models/commissioner.rb create mode 100644 app/views/commissioners/_commissioner.json.jbuilder create mode 100644 app/views/commissioners/_form.html.erb create mode 100644 app/views/commissioners/edit.html.erb create mode 100644 app/views/commissioners/index.html.erb create mode 100644 app/views/commissioners/index.json.jbuilder create mode 100644 app/views/commissioners/new.html.erb create mode 100644 app/views/commissioners/show.html.erb create mode 100644 app/views/commissioners/show.json.jbuilder create mode 100644 db/migrate/20170818090115_create_commissioners.rb create mode 100644 spec/controllers/commissioners_controller_spec.rb create mode 100644 spec/helpers/commissioners_helper_spec.rb create mode 100644 spec/models/commissioner_spec.rb create mode 100644 spec/requests/commissioners_spec.rb create mode 100644 spec/routing/commissioners_routing_spec.rb create mode 100644 spec/views/commissioners/edit.html.erb_spec.rb create mode 100644 spec/views/commissioners/index.html.erb_spec.rb create mode 100644 spec/views/commissioners/new.html.erb_spec.rb create mode 100644 spec/views/commissioners/show.html.erb_spec.rb create mode 100644 test/system/commissioners_test.rb diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f494bdeb..e13ea5e6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + - - - @@ -21,52 +41,53 @@ + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + @@ -105,10 +126,12 @@ @@ -142,6 +165,7 @@ + @@ -157,7 +181,6 @@ - @@ -170,6 +193,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -598,11 +686,6 @@ - - - - - @@ -656,42 +739,72 @@ - + - - + + + + + + + + + + - - - - - - - - - - - + + - + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/javascripts/commissioners.coffee b/app/assets/javascripts/commissioners.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/commissioners.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/commissioners.scss b/app/assets/stylesheets/commissioners.scss new file mode 100644 index 00000000..348090c2 --- /dev/null +++ b/app/assets/stylesheets/commissioners.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the Commissioners controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/commissioners_controller.rb b/app/controllers/commissioners_controller.rb new file mode 100644 index 00000000..a1204de2 --- /dev/null +++ b/app/controllers/commissioners_controller.rb @@ -0,0 +1,74 @@ +class CommissionersController < ApplicationController + before_action :set_commissioner, only: [:show, :edit, :update, :destroy] + + # GET /commissioners + # GET /commissioners.json + def index + @commissioners = Commissioner.all + end + + # GET /commissioners/1 + # GET /commissioners/1.json + def show + end + + # GET /commissioners/new + def new + @commissioner = Commissioner.new + end + + # GET /commissioners/1/edit + def edit + end + + # POST /commissioners + # POST /commissioners.json + def create + @commissioner = Commissioner.new(commissioner_params) + + respond_to do |format| + if @commissioner.save + format.html { redirect_to @commissioner, notice: 'Commissioner was successfully created.' } + format.json { render :show, status: :created, location: @commissioner } + else + format.html { render :new } + format.json { render json: @commissioner.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /commissioners/1 + # PATCH/PUT /commissioners/1.json + def update + respond_to do |format| + if @commissioner.update(commissioner_params) + format.html { redirect_to @commissioner, notice: 'Commissioner was successfully updated.' } + format.json { render :show, status: :ok, location: @commissioner } + else + format.html { render :edit } + format.json { render json: @commissioner.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /commissioners/1 + # DELETE /commissioners/1.json + def destroy + @commissioner.destroy + respond_to do |format| + format.html { redirect_to commissioners_url, notice: 'Commissioner was successfully destroyed.' } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_commissioner + @commissioner = Commissioner.find(params[:id]) + end + + # Never trust parameters from the scary internet, only allow the white list through. + def commissioner_params + params.fetch(:commissioner, {}) + end +end diff --git a/app/helpers/commissioners_helper.rb b/app/helpers/commissioners_helper.rb new file mode 100644 index 00000000..6d7c66be --- /dev/null +++ b/app/helpers/commissioners_helper.rb @@ -0,0 +1,2 @@ +module CommissionersHelper +end diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb new file mode 100644 index 00000000..057a94d0 --- /dev/null +++ b/app/models/commissioner.rb @@ -0,0 +1,2 @@ +class Commissioner < ApplicationRecord +end diff --git a/app/views/commissioners/_commissioner.json.jbuilder b/app/views/commissioners/_commissioner.json.jbuilder new file mode 100644 index 00000000..aa03d57c --- /dev/null +++ b/app/views/commissioners/_commissioner.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! commissioner, :id, :created_at, :updated_at +json.url commissioner_url(commissioner, format: :json) diff --git a/app/views/commissioners/_form.html.erb b/app/views/commissioners/_form.html.erb new file mode 100644 index 00000000..0ad6098b --- /dev/null +++ b/app/views/commissioners/_form.html.erb @@ -0,0 +1,10 @@ +<%= simple_form_for(@commissioner) do |f| %> + <%= f.error_notification %> + +
+
+ +
+ <%= f.button :submit %> +
+<% end %> diff --git a/app/views/commissioners/edit.html.erb b/app/views/commissioners/edit.html.erb new file mode 100644 index 00000000..9f5edfe0 --- /dev/null +++ b/app/views/commissioners/edit.html.erb @@ -0,0 +1,6 @@ +

Editing Commissioner

+ +<%= render 'form', commissioner: @commissioner %> + +<%= link_to 'Show', @commissioner %> | +<%= link_to 'Back', commissioners_path %> diff --git a/app/views/commissioners/index.html.erb b/app/views/commissioners/index.html.erb new file mode 100644 index 00000000..82080871 --- /dev/null +++ b/app/views/commissioners/index.html.erb @@ -0,0 +1,25 @@ +

<%= notice %>

+ +

Commissioners

+ + + + + + + + + + <% @commissioners.each do |commissioner| %> + + + + + + <% end %> + +
<%= link_to 'Show', commissioner %><%= link_to 'Edit', edit_commissioner_path(commissioner) %><%= link_to 'Destroy', commissioner, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Commissioner', new_commissioner_path %> diff --git a/app/views/commissioners/index.json.jbuilder b/app/views/commissioners/index.json.jbuilder new file mode 100644 index 00000000..46cc6b65 --- /dev/null +++ b/app/views/commissioners/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @commissioners, partial: 'commissioners/commissioner', as: :commissioner diff --git a/app/views/commissioners/new.html.erb b/app/views/commissioners/new.html.erb new file mode 100644 index 00000000..21a4e77f --- /dev/null +++ b/app/views/commissioners/new.html.erb @@ -0,0 +1,5 @@ +

New Commissioner

+ +<%= render 'form', commissioner: @commissioner %> + +<%= link_to 'Back', commissioners_path %> diff --git a/app/views/commissioners/show.html.erb b/app/views/commissioners/show.html.erb new file mode 100644 index 00000000..2ec503e3 --- /dev/null +++ b/app/views/commissioners/show.html.erb @@ -0,0 +1,4 @@ +

<%= notice %>

+ +<%= link_to 'Edit', edit_commissioner_path(@commissioner) %> | +<%= link_to 'Back', commissioners_path %> diff --git a/app/views/commissioners/show.json.jbuilder b/app/views/commissioners/show.json.jbuilder new file mode 100644 index 00000000..b059add5 --- /dev/null +++ b/app/views/commissioners/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "commissioners/commissioner", commissioner: @commissioner diff --git a/config/routes.rb b/config/routes.rb index 93a7985a..16f7f1dd 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,6 +2,7 @@ require 'sidekiq/web' Rails.application.routes.draw do + resources :commissioners root 'home#index' mount Sidekiq::Web => '/kiq' diff --git a/db/migrate/20170818090115_create_commissioners.rb b/db/migrate/20170818090115_create_commissioners.rb new file mode 100644 index 00000000..b8c4bca3 --- /dev/null +++ b/db/migrate/20170818090115_create_commissioners.rb @@ -0,0 +1,12 @@ +class CreateCommissioners < ActiveRecord::Migration[5.1] + def change + create_table :commissioners do |t| + t.string :name, :null => false + t.string :emp_id + t.string :created_by + t.string :commission_type + t.boolean :is_active + t.timestamps + end + end +end diff --git a/spec/controllers/commissioners_controller_spec.rb b/spec/controllers/commissioners_controller_spec.rb new file mode 100644 index 00000000..4534dcdf --- /dev/null +++ b/spec/controllers/commissioners_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe CommissionersController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Commissioner. As you add validations to Commissioner, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # 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 + # CommissionersController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + commissioner = Commissioner.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + commissioner = Commissioner.create! valid_attributes + get :show, params: {id: commissioner.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + commissioner = Commissioner.create! valid_attributes + get :edit, params: {id: commissioner.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Commissioner" do + expect { + post :create, params: {commissioner: valid_attributes}, session: valid_session + }.to change(Commissioner, :count).by(1) + end + + it "redirects to the created commissioner" do + post :create, params: {commissioner: valid_attributes}, session: valid_session + expect(response).to redirect_to(Commissioner.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {commissioner: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested commissioner" do + commissioner = Commissioner.create! valid_attributes + put :update, params: {id: commissioner.to_param, commissioner: new_attributes}, session: valid_session + commissioner.reload + skip("Add assertions for updated state") + end + + it "redirects to the commissioner" do + commissioner = Commissioner.create! valid_attributes + put :update, params: {id: commissioner.to_param, commissioner: valid_attributes}, session: valid_session + expect(response).to redirect_to(commissioner) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + commissioner = Commissioner.create! valid_attributes + put :update, params: {id: commissioner.to_param, commissioner: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested commissioner" do + commissioner = Commissioner.create! valid_attributes + expect { + delete :destroy, params: {id: commissioner.to_param}, session: valid_session + }.to change(Commissioner, :count).by(-1) + end + + it "redirects to the commissioners list" do + commissioner = Commissioner.create! valid_attributes + delete :destroy, params: {id: commissioner.to_param}, session: valid_session + expect(response).to redirect_to(commissioners_url) + end + end + +end diff --git a/spec/helpers/commissioners_helper_spec.rb b/spec/helpers/commissioners_helper_spec.rb new file mode 100644 index 00000000..b689bd16 --- /dev/null +++ b/spec/helpers/commissioners_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the CommissionersHelper. For example: +# +# describe CommissionersHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe CommissionersHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/commissioner_spec.rb b/spec/models/commissioner_spec.rb new file mode 100644 index 00000000..d69dd7b8 --- /dev/null +++ b/spec/models/commissioner_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Commissioner, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/commissioners_spec.rb b/spec/requests/commissioners_spec.rb new file mode 100644 index 00000000..17ad9fef --- /dev/null +++ b/spec/requests/commissioners_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Commissioners", type: :request do + describe "GET /commissioners" do + it "works! (now write some real specs)" do + get commissioners_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/commissioners_routing_spec.rb b/spec/routing/commissioners_routing_spec.rb new file mode 100644 index 00000000..8cdaa5f0 --- /dev/null +++ b/spec/routing/commissioners_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe CommissionersController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/commissioners").to route_to("commissioners#index") + end + + it "routes to #new" do + expect(:get => "/commissioners/new").to route_to("commissioners#new") + end + + it "routes to #show" do + expect(:get => "/commissioners/1").to route_to("commissioners#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/commissioners/1/edit").to route_to("commissioners#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/commissioners").to route_to("commissioners#create") + end + + it "routes to #update via PUT" do + expect(:put => "/commissioners/1").to route_to("commissioners#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/commissioners/1").to route_to("commissioners#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/commissioners/1").to route_to("commissioners#destroy", :id => "1") + end + + end +end diff --git a/spec/views/commissioners/edit.html.erb_spec.rb b/spec/views/commissioners/edit.html.erb_spec.rb new file mode 100644 index 00000000..bc4cfd47 --- /dev/null +++ b/spec/views/commissioners/edit.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "commissioners/edit", type: :view do + before(:each) do + @commissioner = assign(:commissioner, Commissioner.create!()) + end + + it "renders the edit commissioner form" do + render + + assert_select "form[action=?][method=?]", commissioner_path(@commissioner), "post" do + end + end +end diff --git a/spec/views/commissioners/index.html.erb_spec.rb b/spec/views/commissioners/index.html.erb_spec.rb new file mode 100644 index 00000000..cdda43d8 --- /dev/null +++ b/spec/views/commissioners/index.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "commissioners/index", type: :view do + before(:each) do + assign(:commissioners, [ + Commissioner.create!(), + Commissioner.create!() + ]) + end + + it "renders a list of commissioners" do + render + end +end diff --git a/spec/views/commissioners/new.html.erb_spec.rb b/spec/views/commissioners/new.html.erb_spec.rb new file mode 100644 index 00000000..b0ea2074 --- /dev/null +++ b/spec/views/commissioners/new.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "commissioners/new", type: :view do + before(:each) do + assign(:commissioner, Commissioner.new()) + end + + it "renders new commissioner form" do + render + + assert_select "form[action=?][method=?]", commissioners_path, "post" do + end + end +end diff --git a/spec/views/commissioners/show.html.erb_spec.rb b/spec/views/commissioners/show.html.erb_spec.rb new file mode 100644 index 00000000..cd369a0b --- /dev/null +++ b/spec/views/commissioners/show.html.erb_spec.rb @@ -0,0 +1,11 @@ +require 'rails_helper' + +RSpec.describe "commissioners/show", type: :view do + before(:each) do + @commissioner = assign(:commissioner, Commissioner.create!()) + end + + it "renders attributes in

" do + render + end +end diff --git a/test/system/commissioners_test.rb b/test/system/commissioners_test.rb new file mode 100644 index 00000000..c6c8f20e --- /dev/null +++ b/test/system/commissioners_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class CommissionersTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit commissioners_url + # + # assert_selector "h1", text: "Commissioner" + # end +end