@@ -25,15 +25,15 @@
covered at
- 7.48
+ 7.45
hits/line)
17 files in total.
- 241 relevant lines.
- 241 lines covered and
+ 243 relevant lines.
+ 243 lines covered and
0 lines missed
@@ -63,9 +63,9 @@
| app/controllers/courses_controller.rb |
100.0 % |
- 98 |
- 46 |
- 46 |
+ 99 |
+ 47 |
+ 47 |
0 |
3.4 |
@@ -73,9 +73,9 @@
| app/controllers/reviews_controller.rb |
100.0 % |
- 119 |
- 52 |
- 52 |
+ 120 |
+ 53 |
+ 53 |
0 |
3.6 |
@@ -240,8 +240,8 @@
5 files in total.
- 173 relevant lines.
- 173 lines covered and
+ 175 relevant lines.
+ 175 lines covered and
0 lines missed
@@ -271,9 +271,9 @@
| app/controllers/courses_controller.rb |
100.0 % |
- 98 |
- 46 |
- 46 |
+ 99 |
+ 47 |
+ 47 |
0 |
3.4 |
@@ -281,9 +281,9 @@
| app/controllers/reviews_controller.rb |
100.0 % |
- 119 |
- 52 |
- 52 |
+ 120 |
+ 53 |
+ 53 |
0 |
3.6 |
@@ -682,8 +682,8 @@ 100.0 % covered
app/controllers/courses_controller.rb
100.0 % covered
- 46 relevant lines.
- 46 lines covered and
+ 47 relevant lines.
+ 47 lines covered and
0 lines missed.
@@ -829,451 +829,457 @@ 100.0 % covered
@reviews = @course.reviews.preload(:user, course: [:school])
-
+
+ 2
+
+ @url = school_course_reviews_path(school_id: @school, course_id: @course)
+
+
+
end
-
+
# GET /courses/new
-
+
1
def new
-
+
2
@course = Course.new
-
+
2
@url = school_courses_path
-
+
end
-
+
# GET /courses/1/edit
-
+
1
def edit
-
+
2
@url = school_course_path
-
+
end
-
+
# POST /courses
-
+
# POST /courses.json
-
+
1
def create
-
+
5
@course = Course.new(course_params)
-
+
respond_to do |format|
-
+
5
if @course.save
-
+
2
format.html do
-
+
2
redirect_to school_course_url(school_id: @school.id, id: @course.id),
-
+
notice: 'Course was successfully created.'
-
+
end
-
+
2
format.json { render :show, status: :created, location: @course }
-
+
else
-
+
6
format.html { render :new }
-
+
3
format.json { render json: @course.errors, status: :unprocessable_entity }
-
+
end
-
+
end
-
+
end
-
+
# PATCH/PUT /courses/1
-
+
# PATCH/PUT /courses/1.json
-
+
1
def update
-
+
4
respond_to do |format|
-
+
4
if @course.update(course_params)
-
+
3
format.html do
-
+
3
redirect_to school_course_url(school_id: @school.id, id: @course.id),
-
+
notice: 'Course was successfully updated.'
-
+
end
-
+
3
format.json { render :show, status: :ok, location: @course }
-
+
else
-
+
2
format.html { render :edit }
-
+
1
format.json { render json: @course.errors, status: :unprocessable_entity }
-
+
end
-
+
end
-
+
end
-
+
# DELETE /courses/1
-
+
# DELETE /courses/1.json
-
+
1
def destroy
-
+
2
@course.destroy
-
+
2
respond_to do |format|
-
+
4
format.html { redirect_to school_courses_url, notice: 'Course was successfully destroyed.' }
-
+
2
format.json { head :no_content }
-
+
end
-
+
end
-
+
private
-
+
# Use callbacks to share common setup or constraints between actions.
-
+
1
def set_school
-
+
26
@school = School.find(params[:school_id])
-
+
end
-
+
def set_course
-
+
10
@course = Course.find(params[:id])
-
+
end
-
+
# Never trust parameters from the scary internet, only allow the white list through.
-
+
1
def course_params
-
+
14
params.require(:course).permit(:name, :number, :department, :school_id)
-
+
end
-
+
end
@@ -1289,8 +1295,8 @@ 100.0 % covered
app/controllers/reviews_controller.rb
100.0 % covered
- 52 relevant lines.
- 52 lines covered and
+ 53 relevant lines.
+ 53 lines covered and
0 lines missed.
@@ -1385,7 +1391,7 @@ 100.0 % covered
1
- @reviews = Review.all
+ @reviews = Review.preload(:user, course: [:school]).all
@@ -1565,448 +1571,454 @@ 100.0 % covered
5
- @review = Review.new(review_params)
+ @url = school_course_reviews_path
5
- respond_to do |format|
+ @review = Review.new(review_params)
5
+ respond_to do |format|
+
+
+
+ 5
+
if @review.save
-
+
2
format.html do
-
+
2
redirect_to school_course_review_url(school_id: @school.id,
-
+
course_id: @course.id,
-
+
id: @review.id),
-
+
notice: 'Review was successfully created.'
-
+
end
-
+
2
format.json { render :show, status: :created, location: @review }
-
+
else
-
+
6
format.html { render :new }
-
+
3
format.json { render json: @review.errors, status: :unprocessable_entity }
-
+
end
-
+
end
-
+
end
-
+
# PATCH/PUT /schools/1/courses/1/reviews/1
-
+
# PATCH/PUT /schools/1/courses/1/reviews/1.json
-
+
1
def update
-
+
4
respond_to do |format|
-
+
4
if @review.update(review_params)
-
+
2
format.html do
-
+
2
redirect_to school_course_review_url(school_id: @school.id,
-
+
course_id: @course.id,
-
+
id: @review.id),
-
+
notice: 'Review was successfully updated.'
-
+
end
-
+
2
format.json { render :show, status: :ok, location: @review }
-
+
else
-
+
4
format.html { render :edit }
-
+
2
format.json { render json: @review.errors, status: :unprocessable_entity }
-
+
end
-
+
end
-
+
end
-
+
# DELETE /schools/1/courses/1/reviews/1
-
+
# DELETE /schools/1/courses/1/reviews/1.json
-
+
1
def destroy
-
+
2
@review.destroy
-
+
2
respond_to do |format|
-
+
4
- format.html { redirect_to school_course_reviews_url, notice: 'Review was successfully destroyed.' }
+ format.html { redirect_to school_course_reviews_url(school_id: @school, course_id: @course), notice: 'Review was successfully destroyed.' }
-
+
2
format.json { head :no_content }
-
+
end
-
+
end
-
+
private
-
+
# Use callbacks to share common setup or constraints between actions.
-
+
1
def set_school
-
+
25
@school = School.find(params[:school_id])
-
+
end
-
+
def set_course
-
+
24
@course = Course.find(params[:course_id])
-
+
end
-
+
def set_review
-
+
11
@review = Review.find(params[:id])
-
+
end
-
+
# Never trust parameters from the scary internet, only allow the white list through.
-
+
1
def review_params
-
+
14
params.require(:review).permit(:course_id,
-
+
:user_id,
-
+
:notes,
-
+
:work_required,
-
+
:difficulty,
-
+
:rating,
-
+
:experience_with_topic,
-
+
:year,
-
+
:term,
-
+
:grade)
-
+
end
-
+
end
@@ -2566,8 +2578,8 @@ 100.0 % covered
def index
-
- 4
+
+ 5
@users = User.all
@@ -2875,7 +2887,7 @@ 100.0 % covered
2
- redirect_to users_url, notice: "#{@user.email} was successfully demoted from admin."
+ redirect_to users_url, notice: "#{@user.email} was successfully promoted to admin."
@@ -3398,7 +3410,7 @@ 100.0 % covered
95
- can [:update, :delete], User do |u|
+ can [:read, :update, :delete], User do |u|
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index f62d38b3..0ec8d600 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -220,8 +220,8 @@
end
describe 'GET #index' do
- it 'returns an access denied' do
- expect { get :index }.to raise_error(CanCan::AccessDenied)
+ it 'returns no errors' do
+ expect { get :index }.not_to raise_error
end
end
