Commit Graph

24 Commits

Author SHA1 Message Date
Aaron Kc Hsu 604ff0c5b0 Change how Observer role works with BBB/Conferences
fixes COMMS-1133

Test Plan
1. Create a new course
2. Create a student and enroll
3. Create an observer or two and enroll
4. In the people tab click three dots to link observer to student
5. Go to conference tab and create a conference
6. Notice the new remove observers checkbox
7. Try to create conferences and update conferences with different settings
8. Notice when you edit the conferences they won’t have the observers checked

Change-Id: I678b8e62308d102bb591f1343313227f22182777
Reviewed-on: https://gerrit.instructure.com/170394
Tested-by: Jenkins
Reviewed-by: Landon Gilbert-Bland <lbland@instructure.com>
QA-Review: Steven Burnett <sburnett@instructure.com>
Product-Review: Aaron Hsu <ahsu@instructure.com>
2018-10-31 18:51:21 +00:00
Cody Cutrer 418abf1b28 rails 5.2: use rack method, not deprecated rails method
Change-Id: I03ef3f282097af1bdb3f1f9f2634ccd46c5398f8
Reviewed-on: https://gerrit.instructure.com/156608
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2018-07-09 20:25:08 +00:00
Cody Cutrer f47e524f0f spec: mocha => rspec-mocks for controllers
Change-Id: I814a91c7209d7ddb00357d12d3546711a5122fe3
Reviewed-on: https://gerrit.instructure.com/120603
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2017-07-26 20:40:52 +00:00
James Williams 4fe9bba72c spec: rails 5.1: rewrite controller spec format - part B-C
Change-Id: I33c8ca114c32d09a00352a28724bd46624600be4
Reviewed-on: https://gerrit.instructure.com/120135
Tested-by: Jenkins
Reviewed-by: Cody Cutrer <cody@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2017-07-25 16:19:32 +00:00
Landon Wilkins 41385e29e7 da licença part 45
add consistent license headers to all source files

Change-Id: I29fdb6dbff5bb4d0e0d7c0ffeea422faaf6a4afa
Reviewed-on: https://gerrit.instructure.com/110150
Tested-by: Jenkins
Reviewed-by: Jon Jensen <jon@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2017-04-28 17:53:35 +00:00
Cody Cutrer ce21af8ecf rails 5: find and fix lots of deprecation warnings [ci verbose]
refs CNVS-34843

Change-Id: Idd523c2a7c37325381d590f1ee70c406ace2a459
Reviewed-on: https://gerrit.instructure.com/105033
Tested-by: Jenkins
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2017-03-16 16:03:51 +00:00
Joel Hough 31247c33fc disable checkbox for undisinvitable conference invitees
fixes CNVS-10155

we don't support dis-inviting conference invitees, so really what
we're doing is disable all checked checkboxes as soon as they're
saved.

test plan
- on the conferences page, edit a conference and add invitees
- reopen the edit dialog
- ensure that the invited users' checkboxes are greyed out

Change-Id: Ifc539f2b100e98a5cc8e77ff924386699510cc52
Reviewed-on: https://gerrit.instructure.com/83507
Tested-by: Jenkins
Reviewed-by: Jeremy Stanley <jeremy@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2016-06-30 19:59:06 +00:00
Simon Williams c975f1f009 log external tool assignment views as assignment AUAs
Our AUA system is set up to be 1-1 with requests, but in the case of
external tool assignments, we call log_asset_access twice, once for the
assignment and once for the tool, and the system is set up that the last
call wins. It has been determined that the old behavior of counting
these as assignments is a better fit.

However, this system is tied into the Live Events system, and that
system handles multiple accesses per request just fine, so we want to
continue to log these to that system.

fixes CNVS-26743

test plan:
- view assignment and non-assignment external tools as a student
- look at the results in the course user page "Access Report"
- the assignment views should be counted as assignments

Change-Id: I31687222065a99c7680012f240b799dd7485edc9
Reviewed-on: https://gerrit.instructure.com/72280
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Jenkins
QA-Review: Jeremy Putnam <jeremyp@instructure.com>
Product-Review: Simon Williams <simon@instructure.com>
2016-02-23 17:54:09 +00:00
Matthew Wheeler 079e0e0b2e Don't invite users with concluded enrollments to conferences
Fixes CNVS-20701

Test plan:

1. Create a course with several students, and conclude the enrollment of
one of them.
Create a conference, checking the "Invite all" option
Verify the concluded enrollment students are not invited

2. Try those steps again with a course-level group (invite several memebers, then
conclude the course enrollment of a user)

3. Try conference creation in an account-level group

4. Regression test inviting users to conferences, include group conferences
and account level group conferences

Change-Id: I8a6f255938d1910851e7d3d640b271648a61fd37
Reviewed-on: https://gerrit.instructure.com/63118
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins
QA-Review: Adrian Russell <arussell@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
2015-09-22 15:18:13 +00:00
James Williams 0011b60afc spec: don't send real requests in conferences_controller_spec
fixes spurious test failures occuring when other specs
require webmock and cause conferences_controller_spec to
fail with a WebMock::NetConnectNotAllowedError

refs #CNVS-19842

Change-Id: Iad091471d4b339d036e182fe849946ea104e62f9
Reviewed-on: https://gerrit.instructure.com/52337
Tested-by: Jenkins
Reviewed-by: Dan Minkevitch <dan@instructure.com>
Product-Review: Dan Minkevitch <dan@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
2015-04-16 19:58:41 +00:00
Cody Cutrer bd9ba4e545 rspec 3-ify spec/controllers
refs CNVS-16239

Change-Id: I063c25c1481deb634c652f6b45e75b63c7f4dcd3
Reviewed-on: https://gerrit.instructure.com/42677
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-10-14 16:34:30 +00:00
Cody Cutrer dacf060160 no more dynamic finders
fixes CNVS-15126

Change-Id: I48b99ff69942463df6d6c355fe6f8a2fc679e69a
Reviewed-on: https://gerrit.instructure.com/41969
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2014-10-03 16:22:49 +00:00
Jon Jensen 88578b84a7 spec: speed up spec/controllers/[a-c]*
in rails3, reduce runtime ~45% (8:10 -> 4:25 locally)

Change-Id: Ia3d17b99f1d80d5cc344ff7286244eb551a6c6b1
Reviewed-on: https://gerrit.instructure.com/38417
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Landon Wilkins <lwilkins@instructure.com>
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>
2014-07-31 16:09:14 +00:00
Joel Hough fad6d771dc conferences that use disabled plugins are not listed
fixes CNVS-10839

test plan
- enable wimba and adobe connect conference plugins
- make a conference
- ensure it is visible on the conference index page
- disable the plugin for the conference
- ensure it is no longer visible on the conference index page

Change-Id: Idc26d306f683fade5bf6d8619dfe9325047bb116
Reviewed-on: https://gerrit.instructure.com/29487
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
2014-01-31 22:58:29 +00:00
Zach Pendleton edd5f5d82d remove dimdim plugin
dimdim no longer exists; no need to keep this code
around.

Change-Id: I3b1b360b71eccd7b10fd36c577bdac7b6f81976a
Reviewed-on: https://gerrit.instructure.com/24512
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cam Theriault <cam@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
2013-10-07 21:56:10 +00:00
Cody Cutrer d3f0b18684 validate nullness in the db on a bunch of columns
fixes CNVS-7414

Change-Id: I60978f66d88d916dc5736dbb975715172bd1e14b
Reviewed-on: https://gerrit.instructure.com/23141
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2013-09-12 22:20:39 +00:00
Ethan Vizitei c8b1c36d6f refs #8395 expanded page views
force a page_view record when
submitting an assignment
and when updating an assignment
description

force a page_view when
starting a new discussion
or when replying to a discussion

force a page_view when updating
a wiki page and when joining
a conference and when starting
a collaboration

start tracking http methods for
page views

don't link through to urls
for page views if they aren't 'get'
methods

pull some of the page_view logging
down into the asset_user_access
object and simplify it so
that the application controller is
more readable and the scoring incrementing
is easier to understand

TEST PLAN:
  1) login as a student
  2) turn in an assignment submission
  3) take a quiz
  4) update an assignment description
  5) start a discussion and reply to it
  6) login as an admin and confirm through
     analytics and through the detailed
     page view listing that all these
     actions counted as participations
     (and that the ones that are not
      'get' methods can't be clicked through
      from the student accound details page)

Change-Id: I2dfe4df41e8b006e6a0c0d8a1f914ecd7fb62477
Reviewed-on: https://gerrit.instructure.com/15428
Reviewed-by: Jacob Fugal <jacob@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
2012-11-30 08:34:18 -07:00
Sam Olds 9c09c52d41 doesn't show concluded users in collaborations and conferences
fixes #8845

originally, this issue was that if a student was concluded from a course
they would still show up in the list of students to be added to both
collaborations and conferences. this commit fixes that and also prevents
the student view student from showing up in the list of students when
creating a new conference.

test plan
  - be a teacher in a course with a few students and collaborations and
    conferences enabled
  - go to a collaboration and a conference and see the students listed
    there (when starting a new collaboration/conference)
  - conclude a student from the course
  - click student student view, then leave student view
  - back in the collaborations and conferences, the concluded student
    should no longer be listed, and test student should not be listed

Change-Id: I08da39a79ef1508e53064adf54bfacac0c527457
Reviewed-on: https://gerrit.instructure.com/12100
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Sam Olds <sam@instructure.com>
2012-07-12 15:49:23 -06:00
Jon Jensen af9587874e let students join inactive long-running conferences, fixes #7454
added a :resume permission so participants can join long-running
conferences even if they go inactive

test plan:
1. set up wimba (or bbb)
2. create a conference with a duration
3. confirm that students can't join unless it's active (in the case of
   wimba, that means an admin needs to be in the conference. for bbb,
   an admin needs to have been present in the last hour)
4. create a long running conference (no duration)
5. confirm that students can join any time after it was started,
   regardless of whether the admin is still participating

Change-Id: Ie81ea7309b6334d88269af098f3b0da6fb04a177
Reviewed-on: https://gerrit.instructure.com/9433
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
2012-03-19 16:50:33 -06:00
Brian Palmer 3a7b9dc239 fix up web conference related spec failures
Depending on spec run order, these would fail due to various plugin
setting problems and/or a bad stubbing in an api spec

Change-Id: I6b82949cb9eb67cc6b4d1e55c1393a42d7054c69
Reviewed-on: https://gerrit.instructure.com/6530
Reviewed-by: Cody Cutrer <cody@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
2011-10-27 10:29:43 -06:00
Cody Cutrer 80907b4dd5 fixes #4983 conferences for groups
* Add conference_close route for group conferences
 * Pull *group* conferences, not the group's context's conferences
   when showing the groups' feed
 * Add the conferences tab (where appropriate) to the group sidebar,
   so the conferences controller won't refuse to work

Change-Id: I37bfb546c4bf8ad4078e4c9ca7a7292bb475af2c
Reviewed-on: https://gerrit.instructure.com/4954
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
2011-08-05 14:31:01 -06:00
Jon Jensen e44cfb2c90 long running web conferences, closes #4228
Change-Id: Ica373ebc48edf3575d49d49071bfa878b5b15d3f
Reviewed-on: https://gerrit.instructure.com/3791
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Whitmer <brian@instructure.com>
2011-05-26 09:56:38 -06:00
Brian Palmer 432a7fd6b3 send web conference invitiation notifications, refs #4513
Change-Id: I58740b718afd194db3da18faded9fcc9642c082d
Reviewed-on: https://gerrit.instructure.com/3731
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Jon Jensen <jon@instructure.com>
2011-05-20 12:48:09 -06:00
Brian Whitmer 8b8173dcc9 Initial commit.
closes #6988138
2011-01-31 18:57:29 -07:00