Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarkUsProject/Markus
base: b4ca278
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 1c5a6ce
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 14, 2012

  1. closes #257 - closes #660 - restructured completely rubrics criteria

    controller test.
    
    - deleted redundant tests
    - reorganised them
    - properly used contexts and should - we have a speed up of 300% on this file
    
    They know are of the form:
    
      + rubrics_controller_test.rb
        |
        +--- An unauthenticated and unauthorized user
        |    |
        |    +--- with an assignment
        |         |   - should be redirected on index
        |         |   - should be redirected on new
        |         |   - should be redirected on :download_csv
        |         |   - should be redirected on :download_yml
        |         |   - should be redirected on :csv_upload
        |         |   - should be redirected on :update_positions
        |         |   - should be redirected on :move_criterion
        |         |
        |         +--- and a submission
        |              |   - should be redirect on edit
        |              |   - should be redirected on update
        |              |   - should be redirect on delete
        |
        +--- An admin, with an assignment
             |   - should upload successfully properly formatted csv file
             |   - should deal properly with ill formatted CSV files
             |   - should upload successfully well formatted yml criteria
             |   - should deal with bad weight on yaml file
             |   - should deal properly with yml syntax error
             |   - should deal properly with empty yml file
             |
             +--- with a criterion
                  |   - should see index
                  |   - should be able to get on :edit
                  |   - should be able to save with errors
                  |   - should be able to  save without errors
                  |   - should be able to get the form for new rubric
                  |   - should be able to save with error
                  |   - should save without error on an assignment as the first
    criterion
                  |   - should save without errors
                  |   - should delete criterion
                  |   - should download rubrics as CSV
                  |   - should upload yml file without deleting preexisting
    criteria
                  |
                  +--- with another criterion
                       |   - should be able to update_positions
                       |   - should be able to move_criterion up
                       |   - should be able to move_criterion down
                       |
                       +--- And yet another
                            |   - should be able to move up top criteria
                            |   - should be able to move down top criteria
    NelleV committed Feb 14, 2012
    Copy the full SHA
    74d25b4 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #663 from NelleV/257_rubrics_criteria_controller_t…

    …ests
    
    closes #257 - closes #660 - restructured completely rubrics criteria
    benjaminvialle committed Feb 14, 2012
    Copy the full SHA
    1c5a6ce View commit details
    Browse the repository at this point in the history