diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-02 19:17:54 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-02 19:17:54 +0300 |
commit | 5a4a08249055022e9e6e30d9ab38c45c1bf71842 (patch) | |
tree | eda99155dee262f3965a7938c9184e73022cf48a /spec/helpers/issuables_helper_spec.rb | |
parent | e591401b0b3f08baf4cd28d0fcb8e184a515fc74 (diff) | |
parent | aea03d7cdfb882762426dbb5cab805682afe5e2a (diff) |
Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-for-issues-9-3
Diffstat (limited to 'spec/helpers/issuables_helper_spec.rb')
-rw-r--r-- | spec/helpers/issuables_helper_spec.rb | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/spec/helpers/issuables_helper_spec.rb b/spec/helpers/issuables_helper_spec.rb index 728fdfc85f2..8fcf7f5fa15 100644 --- a/spec/helpers/issuables_helper_spec.rb +++ b/spec/helpers/issuables_helper_spec.rb @@ -193,39 +193,14 @@ describe IssuablesHelper do end end - describe '#issuable_app_data' do - let(:user) { create(:user) } - let(:project) { create(:project) } - let(:issue) { create(:issue, project: project, last_edited_by: user, created_at: 3.days.ago, updated_at: 2.days.ago, last_edited_at: 2.days.ago) } - let(:issue_app_data) do - { - endpoint: realtime_changes_namespace_project_issue_path(project.namespace, project, issue), - 'can-update' => "true", - 'issuable-ref' => issue.to_reference || '', - updated_at: issue.updated_at.to_time.iso8601, - updated_by: { - name: user.name, - path: user_path(user) - } - } - end - - before do - allow(helper).to receive(:current_user).and_return(nil) - allow(helper).to receive(:can?).with(nil, :update_issue, issue).and_return(true) - end - - it { expect(helper.issuable_app_data(issue.project, issue)).to eq(issue_app_data) } - end - describe '#updated_at_by' do let(:user) { create(:user) } let(:unedited_issuable) { create(:issue) } let(:edited_issuable) { create(:issue, last_edited_by: user, created_at: 3.days.ago, updated_at: 2.days.ago, last_edited_at: 2.days.ago) } let(:edited_updated_at_by) do { - updated_at: edited_issuable.updated_at.to_time.iso8601, - updated_by: { + updatedAt: edited_issuable.updated_at.to_time.iso8601, + updatedBy: { name: user.name, path: user_path(user) } |