Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
dhp-venshop
dhp-venshop
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Hoang Phuc Do
  • dhp-venshopdhp-venshop
  • Merge Requests
  • !10

Merged
Opened Jun 30, 2017 by Hoang Phuc Do@phucdh 
  • Report abuse
Report abuse

[REVIEW] RSpec Feature

Edited Jun 30, 2017 by Hoang Phuc Do
  • Discussion 2
  • Commits 2
  • Changes 22
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Hoang Phuc Do @phucdh

    changed title from RSpec Feature to [REVIEW] RSpec Feature

    Jun 30, 2017

    changed title from RSpec Feature to [REVIEW] RSpec Feature

    changed title from **RSpec Feature** to **{+[REVIEW] +}RSpec Feature**
    Toggle commit list
  • Trong Huu Nguyen
    @huunt started a discussion on an old version of the diff Jun 30, 2017
    Resolved by Hoang Phuc Do Jul 03, 2017
    spec/controllers/orders_controller_spec.rb 0 → 100644
    130 end
    131 end
    132 end
    133
    134 describe '#update' do
    135 def do_request
    136 patch :update, params: { id: order.id, order: order_params }
    137 end
    138
    139 context 'as an authorized user' do
    140 let(:admin_user) { FactoryGirl.create(:user, admin: true) }
    141 let!(:order) { FactoryGirl.create(:order) }
    142 before { sign_in admin_user }
    143
    144 context 'with valid attributes' do
    145 let!(:order_params) { FactoryGirl.attributes_for(:order, order_status: 'Done') }
    • Trong Huu Nguyen @huunt commented Jun 30, 2017
      Master

      Please change order_status to status

      Edited Jul 03, 2017
      Please change order_status to status
    • Hoang Phuc Do @phucdh

      changed this line in version 2 of the diff

      Jun 30, 2017

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phucdh/dhp-venshop/merge_requests/10/diffs?diff_id=3425&start_sha=b6b1983a16d1e908477b15b340e36b777c5bc7a0#734b0200c347496a84cbccea00b2b1d592a97238_145_145)
      Toggle commit list
    Please register or sign in to reply
  • Trong Huu Nguyen
    @huunt started a discussion on an old version of the diff Jun 30, 2017
    Resolved by Hoang Phuc Do Jul 03, 2017
    spec/controllers/orders_controller_spec.rb 0 → 100644
    143
    144 context 'with valid attributes' do
    145 let!(:order_params) { FactoryGirl.attributes_for(:order, order_status: 'Done') }
    146
    147 it 'save changes to database' do
    148 do_request
    149 expect(order.reload.order_status).to eq 'Done'
    150 end
    151 end
    152
    153 context 'with invalid attributes' do
    154 let!(:order_params) { FactoryGirl.attributes_for(:order, user_id: nil) }
    155
    156 it 'does not save changes to database' do
    157 do_request
    158 expect(order.reload.order_status).to eq 'Pending'
    • Trong Huu Nguyen @huunt commented Jun 30, 2017
      Master

      Please change order_status to status

      Edited Jul 03, 2017
      Please change order_status to status
    • Hoang Phuc Do @phucdh

      changed this line in version 2 of the diff

      Jun 30, 2017

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.zigexn.vn/phucdh/dhp-venshop/merge_requests/10/diffs?diff_id=3425&start_sha=b6b1983a16d1e908477b15b340e36b777c5bc7a0#734b0200c347496a84cbccea00b2b1d592a97238_158_158)
      Toggle commit list
    Please register or sign in to reply
  • Hoang Phuc Do @phucdh

    added 13 commits

    • b6b1983a...598b3bb5 - 12 commits from branch development
    • 0cc9dc07 - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    Jun 30, 2017

    added 13 commits

    • b6b1983a...598b3bb5 - 12 commits from branch development
    • 0cc9dc07 - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    added 13 commits * b6b1983a...598b3bb5 - 12 commits from branch `development` * 0cc9dc07 - Merge remote-tracking branch 'origin/development' into dhp_rspec_2 [Compare with previous version](https://gitlab.zigexn.vn/phucdh/dhp-venshop/merge_requests/10/diffs?diff_id=3425&start_sha=b6b1983a16d1e908477b15b340e36b777c5bc7a0)
    Toggle commit list
  • Hoang Phuc Do @phucdh

    added 1 commit

    • 63adf1fa - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    Jun 30, 2017

    added 1 commit

    • 63adf1fa - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    added 1 commit * 63adf1fa - Merge remote-tracking branch 'origin/development' into dhp_rspec_2 [Compare with previous version](https://gitlab.zigexn.vn/phucdh/dhp-venshop/merge_requests/10/diffs?diff_id=3426&start_sha=0cc9dc07461c365bcece75c160d450432133fb04)
    Toggle commit list
  • Hoang Phuc Do @phucdh

    added 1 commit

    • 77e505b5 - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    Jun 30, 2017

    added 1 commit

    • 77e505b5 - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    added 1 commit * 77e505b5 - Merge remote-tracking branch 'origin/development' into dhp_rspec_2 [Compare with previous version](https://gitlab.zigexn.vn/phucdh/dhp-venshop/merge_requests/10/diffs?diff_id=3428&start_sha=63adf1fac7f568bad981a2ee807b9cd3f5cca9e2)
    Toggle commit list
  • Hoang Phuc Do @phucdh

    resolved all discussions

    Jul 03, 2017

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Hoang Phuc Do @phucdh

    added 1 commit

    • 9e38866a - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    Jul 03, 2017

    added 1 commit

    • 9e38866a - Merge remote-tracking branch 'origin/development' into dhp_rspec_2

    Compare with previous version

    added 1 commit * 9e38866a - Merge remote-tracking branch 'origin/development' into dhp_rspec_2 [Compare with previous version](https://gitlab.zigexn.vn/phucdh/dhp-venshop/merge_requests/10/diffs?diff_id=3429&start_sha=77e505b5d914cafb12b99629d8486a8cb1494619)
    Toggle commit list
  • Trong Huu Nguyen @huunt

    mentioned in commit 07fd62c6

    Jul 03, 2017

    mentioned in commit 07fd62c6

    mentioned in commit 07fd62c6dcd8f76dbb1c545ecc93021d0ac6a97c
    Toggle commit list
  • Trong Huu Nguyen @huunt

    merged

    Jul 03, 2017

    merged

    merged
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: phucdh/dhp-venshop!10
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.