add compare page test and add swich base branch button ・ b9faf28 ・ Gitprep

Code
Issues
1
Pull request
0
Wiki
Members

- add compare page test and add swich base branch button;
- Browse files
- Yuki Kimoto commited on 2013-05-29
- 1 parent 1e42129
  
  commit b9faf288e372259572eddfb94726e898f6f4b456

Showing 2 changed files with 10 additions and 3 deletions

+1 -1

templates/compare.html.ep

@@ -128,7 +128,7 @@
           </button>
         </div>
         <div class="text-right">
-          <button class="btn" style="padding:2px 10px">Edit</button>
+          <a href="<%= url_for("/$user/$project/compare/$rev2...$rev1") %>" class="btn" style="padding:2px 10px">Swich base branch</a>
         </div>
       </div>
 

+9 -2

xt/basic.t

View

@@ -347,5 +347,12 @@ note 'Branches';
   
   # Marged branch
   $t->content_like(qr/"merged-branch.*?b2/s);
-  
-}
+}
+
+note 'Compare';
+{
+  # Page access
+  $t->get_ok("/$user/$project/compare/master...no_merged");
+  $t->content_like(qr/branch change/);
+  $t->content_like(qr#http://foo5branch change#);
+}

...	...	@@ -128,7 +128,7 @@
128	128	</button>
129	129	</div>
130	130	<div class="text-right">
131		- <button class="btn" style="padding:2px 10px">Edit</button>
	131	+ <a href="<%= url_for("/$user/$project/compare/$rev2...$rev1") %>" class="btn" style="padding:2px 10px">Swich base branch</a>
132	132	</div>
133	133	</div>
134	134

...	...	@@ -347,5 +347,12 @@ note 'Branches';
347	347
348	348	# Marged branch
349	349	$t->content_like(qr/"merged-branch.*?b2/s);
350		-
351		-}
	350	+}
	351	+
	352	+note 'Compare';
	353	+{
	354	+ # Page access
	355	+ $t->get_ok("/$user/$project/compare/master...no_merged");
	356	+ $t->content_like(qr/branch change/);
	357	+ $t->content_like(qr#http://foo5branch change#);
	358	+}